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 a23b61c935a0720d568a8efdc28bdc2306d24a9f..1cfe82ded8913652a98b1ff2be2b5054a05e1086 100644 (file)
--- 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 9d6e56b7a473da64b47158fa38e8b309e350464f..d51bd701e577ab561d97116e0c927aacf147f189 100644 (file)
--- 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 e5813db9782609fd07b8d1df0ea7d441d5a3b67f..3eb0b17e79e7560c791ec0fa505af015bb39270e 100644 (file)
--- 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 14609a54f2459089848e014e21adcd54406da4c5..414e967616069b68e1ec8da9899d330fcbd05676 100644 (file)
--- 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 976529bd3ff3d160a21b3f9c702bcd96a880e1aa..e13e3fd5aa1b9bc4e10151b1ef928446249314e2 100644 (file)
--- 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 c490f051bb7239c60c784eedeeb0ddbd595a91f1..b2106fcdaa03192c00b61a5afe1ffbb8ac3dce49 100644 (file)
--- 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 e7feeded7bc80d9ecda5f8134305120dbbda7bef..0e982016f425e0cfe089a28b28accd0faf1372b0 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>;
-                       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 de27b0e7d2ed4c92fc0259f12e5814df2b148cd3..d697b0476906b07c35ead27f6596ab7c7c186803 100644 (file)
--- 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 e9f443cbef9c0780aa1aa63b234a26bfdae99528..8070fefbb71e7daf6a2741cb74707e4f13134b2e 100644 (file)
--- 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 98879927cbee15397d4376eb868c5e81492f5390..b50e4b51a45c4618885b69ce4b66b6d871a2ca32 100644 (file)
--- 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");
 +