[openwrt/openwrt] ath79: remove dr_mode and vbus-supply

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 8 05:55:32 PST 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/4abd81968395ddf1a4b1db1324c6e0da10be1321

commit 4abd81968395ddf1a4b1db1324c6e0da10be1321
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sat Jan 4 18:49:14 2025 -0800

    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 at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/17486
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/ath79/dts/ar9344_nec_aterm.dtsi           |  2 --
 target/linux/ath79/dts/ar9344_qihoo_c301.dts           |  4 ++--
 target/linux/ath79/dts/qca9531_8dev_carambola3.dts     |  2 --
 target/linux/ath79/dts/qca9531_8dev_lima.dts           |  2 --
 target/linux/ath79/dts/qca9531_alcatel_hh40v.dts       |  2 --
 target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts |  2 --
 target/linux/ath79/dts/qca953x.dtsi                    |  1 -
 target/linux/ath79/dts/qca9558_aruba_ap-115.dts        |  1 -
 target/linux/ath79/dts/qca9558_nec_aterm.dtsi          |  2 --
 target/linux/ath79/dts/qca9558_sophos_ap.dtsi          |  4 ----
 target/linux/ath79/dts/qca9558_sophos_ap100.dts        |  1 -
 target/linux/ath79/dts/qca9558_sophos_ap55.dts         |  1 -
 target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi   |  4 ----
 target/linux/ath79/dts/qca955x_elecom_wab.dtsi         | 12 +-----------
 14 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/target/linux/ath79/dts/ar9344_nec_aterm.dtsi b/target/linux/ath79/dts/ar9344_nec_aterm.dtsi
index dfe2b064b7..ba1cd41b8e 100644
--- 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 at 1;
 
 	/* NEC uPD720114 */
diff --git a/target/linux/ath79/dts/ar9344_qihoo_c301.dts b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
index 0e9104dbb9..a63c8bc4d9 100644
--- 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 a1149aeaeb..a740999af6 100644
--- 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 884d1a588e..22d80a7d6f 100644
--- 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 16ba785a23..800d32611d 100644
--- 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 6f96b61392..127b1ad358 100644
--- 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 0e982016f4..782b0949ca 100644
--- 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 7a59bda6eb..8f6cb71724 100644
--- 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 76d39c2ee7..441d906f44 100644
--- 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 at 1;
 
 	/* NEC uPD720114 */
diff --git a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
index 744871a931..965ce351c9 100644
--- 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 50ed5fbfba..ebd82ebd79 100644
--- 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 9a3fd61c93..2259360deb 100644
--- 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 b4f32b9fc7..b7fc212d8e 100644
--- 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 43e34c6029..3d16d4aa70 100644
--- 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 at 1 {
-		reg = <1>;
-		#trigger-source-cells = <0>;
-	};
 };
 
 &wdt {




More information about the lede-commits mailing list