ath79: remove dr_mode and vbus-supply

ath79 uses the generic-ehci driver, which does not support regulators
using vbus-supply.

dr_mode is also not useful as the driver does not support multiple
modes.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17486
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ath79/dts/ar9344_nec_aterm.dtsi b/target/linux/ath79/dts/ar9344_nec_aterm.dtsi
index dfe2b064b7e982299e1d66a3e30f39f29fd354d3..ba1cd41b8e3683681c2625d2158609c15093fbc5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_nec_aterm.dtsi
+++ b/target/linux/ath79/dts/ar9344_nec_aterm.dtsi
@@ -281,8 +281,6 @@
        #address-cells = <1>;
        #size-cells = <0>;
 
-       dr_mode = "host";
-
        /delete-node/ port@1;
 
        /* NEC uPD720114 */

diff --git a/target/linux/ath79/dts/ar9344_qihoo_c301.dts b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
index 0e9104dbb990e7bbeba1a9bd742894abd891a90d..a63c8bc4d9a031e2d355462976e3d02c27a1b067 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qihoo_c301.dts
+++ b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
@@ -59,8 +59,9 @@
                regulator-name = "usb_vbus";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
-               enable-active-high;
+               regulator-always-on;
                gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
        };
 };
 
@@ -208,7 +209,6 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &pcie {

diff --git a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
index a1149aeaeb0cb9a4899f0a3fd86a89368d7c62ee..a740999af6d4441923fdf2f5162553a6d4c125bd 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
@@ -35,8 +35,6 @@
 
 &usb0 {
        status = "okay";
-
-       dr_mode = "host";
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts
index 884d1a588e7949b7458a6056feb0962a5f667785..22d80a7d6fe15cba6edf09f779ab0f5ef8b30d21 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_lima.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts
@@ -26,8 +26,6 @@
 
 &usb0 {
        status = "okay";
-
-       dr_mode = "host";
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
index 16ba785a235289eeca61615ffe0495045e7015ca..800d32611d54c6f989ba04ce770075449285b296 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
+++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
@@ -74,8 +74,6 @@
 
 &usb0 {
        status = "okay";
-
-       dr_mode = "host";
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts
index 6f96b613928cbb2bd39631b49da30924e8a8b24f..127b1ad3584ccbec6d5c566a6c1f3996a7a2dc44 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts
@@ -19,8 +19,6 @@
 
 &usb0 {
        status = "okay";
-
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index 0e982016f425e0cfe089a28b28accd0faf1372b0..782b0949ca72004f5b0ec8e56a2ce3c141c71cda 100644 (file)
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -193,7 +193,6 @@
 
                        interrupts = <3>;
                        resets = <&rst 5>;
-                       dr_mode = "host";
 
                        has-transaction-translator;
                        caps-offset = <0x100>;

diff --git a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
index 7a59bda6eb22df9a7134617f9906196abefb6ec6..8f6cb71724f8952788120b51db32f0aa5f00ea20 100644 (file)
--- a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
+++ b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
@@ -243,6 +243,5 @@
 };
 
 &usb0 {
-       dr_mode = "host";
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/qca9558_nec_aterm.dtsi b/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
index 76d39c2ee700a0675ee48d1e98704d4f7c8d78e8..441d906f449a7b38af33a489ab08affd2e587956 100644 (file)
--- a/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
+++ b/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
@@ -352,8 +352,6 @@
        #address-cells = <1>;
        #size-cells = <0>;
 
-       dr_mode = "host";
-
        /delete-node/ port@1;
 
        /* NEC uPD720114 */

diff --git a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
index 744871a9311fd0cb5f39a081bcb3bcb257746988..965ce351c9a96b8a15ded00c526604c819b08c8e 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
+++ b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
@@ -191,7 +191,3 @@
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
 };
-
-&usb0 {
-       vbus-supply = <&reg_usb_vbus>;
-};

diff --git a/target/linux/ath79/dts/qca9558_sophos_ap100.dts b/target/linux/ath79/dts/qca9558_sophos_ap100.dts
index 50ed5fbfbadb534c6a568275364a22f3d9123b10..ebd82ebd79213e4982f2684324bcf3c964e8b029 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sophos_ap100.dts
+++ b/target/linux/ath79/dts/qca9558_sophos_ap100.dts
@@ -17,5 +17,4 @@
 
 &usb0 {
        status = "okay";
-       dr_mode = "host";
 };

diff --git a/target/linux/ath79/dts/qca9558_sophos_ap55.dts b/target/linux/ath79/dts/qca9558_sophos_ap55.dts
index 9a3fd61c933c7e8e823efe307e03bb553b055713..2259360debacd5e5c1b9bd89776208c78186a764 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sophos_ap55.dts
+++ b/target/linux/ath79/dts/qca9558_sophos_ap55.dts
@@ -17,5 +17,4 @@
 
 &usb0 {
        status = "okay";
-       dr_mode = "host";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
index b4f32b9fc7c9ceb8641d30fb0db900fe1126671e..b7fc212d8e4adc72a29e8b8d96db49a0f30995e7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
@@ -145,8 +145,6 @@
 };
 
 &usb0 {
-       dr_mode = "host";
-       vbus-supply = <&reg_usb0_vbus>;
        status = "okay";
 };
 
@@ -155,7 +153,5 @@
 };
 
 &usb1 {
-       dr_mode = "host";
-       vbus-supply = <&reg_usb1_vbus>;
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/qca955x_elecom_wab.dtsi b/target/linux/ath79/dts/qca955x_elecom_wab.dtsi
index 43e34c6029182d7467164246543c0d540e206dbc..3d16d4aa70574e25d80a034d4af9d9f080bfc12a 100644 (file)
--- a/target/linux/ath79/dts/qca955x_elecom_wab.dtsi
+++ b/target/linux/ath79/dts/qca955x_elecom_wab.dtsi
@@ -34,7 +34,7 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_USB;
-                       trigger-sources = <&usb_port1>;
+                       trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
        };
@@ -232,17 +232,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       dr_mode = "host";
-       vbus-supply = <&reg_usb_vbus>;
-
-       usb_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &wdt {