From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 29 Nov 2024 22:24:38 +0000 (-0800)
Subject: ath79: usb: remove reset names
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=481bf5805a5961ba154826d24d40587058066773;p=openwrt%2Fstaging%2Fblocktrron.git

ath79: usb: remove reset names

Upstream uses devm_reset_control_array_get_optional_shared, which does
not use names. reset-names is also not specified in the documentation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17118
Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index a23b61c935..1cfe82ded8 100644
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -54,7 +54,7 @@
 				compatible = "qca,ar7100-usb-phy";
 				reg = <0x18030000 0x10>;
 
-				reset-names = "phy", "usb-host", "usb-ohci-dll";
+				reset-names = "phy", "host", "usb-ohci-dll";
 				resets = <&rst 4>, <&rst 5>, <&rst 6>;
 
 				#phy-cells = <0>;
diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 9d6e56b7a4..d51bd701e5 100644
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -27,7 +27,6 @@
 		interrupts = <3>;
 
 		resets = <&rst 5>;
-		reset-names = "usb-host";
 
 		phy-names = "usb";
 		phys = <&usb_phy>;
diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index e5813db978..3eb0b17e79 100644
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -27,7 +27,6 @@
 		interrupts = <3>;
 
 		resets = <&rst 5>;
-		reset-names = "usb-host";
 
 		has-transaction-translator;
 		caps-offset = <0x100>;
diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi
index 14609a54f2..414e967616 100644
--- a/target/linux/ath79/dts/ar7242.dtsi
+++ b/target/linux/ath79/dts/ar7242.dtsi
@@ -27,7 +27,6 @@
 		interrupts = <3>;
 
 		resets = <&rst 5>;
-		reset-names = "usb-host";
 
 		has-transaction-translator;
 		caps-offset = <0x100>;
diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 976529bd3f..e13e3fd5aa 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -120,7 +120,6 @@
 
 			interrupts = <3>;
 			resets = <&rst 5>;
-			reset-names = "usb-host";
 
 			phy-names = "usb";
 			phys = <&usb_phy>;
diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi
index c490f051bb..b2106fcdaa 100644
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -166,7 +166,6 @@
 
 			interrupts = <3>;
 			resets = <&rst 5>;
-			reset-names = "usb-host";
 
 			has-transaction-translator;
 			caps-offset = <0x100>;
diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index e7feeded7b..0e982016f4 100644
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -193,7 +193,6 @@
 
 			interrupts = <3>;
 			resets = <&rst 5>;
-			reset-names = "usb-host";
 			dr_mode = "host";
 
 			has-transaction-translator;
diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index de27b0e7d2..d697b04769 100644
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -273,7 +273,6 @@
 			interrupt-parent = <&intc3>;
 			interrupts = <1>;
 			resets = <&rst 5>;
-			reset-names = "usb-host";
 
 			has-transaction-translator;
 			caps-offset = <0x100>;
@@ -299,7 +298,6 @@
 			interrupt-parent = <&intc3>;
 			interrupts = <2>;
 			resets = <&rst2 5>;
-			reset-names = "usb-host";
 
 			has-transaction-translator;
 			caps-offset = <0x100>;
diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index e9f443cbef..8070fefbb7 100644
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -192,7 +192,6 @@
 			interrupts = <1>;
 
 			resets = <&rst 5>;
-			reset-names = "usb-host";
 
 			has-transaction-translator;
 			caps-offset = <0x100>;
@@ -219,7 +218,6 @@
 			interrupts = <2>;
 
 			resets = <&rst2 5>;
-			reset-names = "usb-host";
 
 			has-transaction-translator;
 			caps-offset = <0x100>;
diff --git a/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch
index 98879927cb..b50e4b51a4 100644
--- a/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch
+++ b/target/linux/ath79/patches-6.6/700-phy-add-ath79-usb-phys.patch
@@ -132,7 +132,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	if (IS_ERR(priv->rst_phy))
 +		return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing");
 +
-+	priv->rst_host = devm_reset_control_get(&pdev->dev, "usb-host");
++	priv->rst_host = devm_reset_control_get(&pdev->dev, "host");
 +	if (IS_ERR(priv->rst_host))
 +		return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_host), "host reset is missing");
 +