ath79: usb: remove usb- from reset-names

This matches the upstream PHY driver, which removed it.

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 5237157458ed6b1269b686494ff2eeaa4c5a648c..bac27d9284957dffbd0e5c3f1cff889484700f56 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 = "usb-phy", "usb-host", "usb-ohci-dll";
+                               reset-names = "phy", "usb-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 eb4b2e4aa39367e907f0e4622451f7298caa9513..23409b25d6c3b25a36257894013701926556f590 100644 (file)
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -6,7 +6,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-ohci-dll";
+               reset-names = "phy", "usb-ohci-dll";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index 8d0e60da4024e38c771b74fb9b1dc32904c55d13..3dd074002527d8df292696929005480719831719 100644 (file)
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -6,7 +6,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi
index aab6c28f7b1f39aca79fe68094decd0d67dbcc96..9b4cc9920a76b366128c722570c0a29611d94937 100644 (file)
--- a/target/linux/ath79/dts/ar7242.dtsi
+++ b/target/linux/ath79/dts/ar7242.dtsi
@@ -6,7 +6,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi
index 71181c46de68dd1426a1aa37fc42582ac7e39241..2ea689fac16bd5c09751d07b79673cd3406fb4c4 100644 (file)
--- a/target/linux/ath79/dts/ar9132.dtsi
+++ b/target/linux/ath79/dts/ar9132.dtsi
@@ -188,7 +188,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 466e0fb25dc5a1e42fa31831313b3cb9f785c190..5b53ec1e4f10d6a9c47598fb183417c09aca22b2 100644 (file)
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -166,7 +166,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi
index 98cd76629f361726a6ea4f7f8383959a86dd8767..c3bdfc916d6529f1937c6aacd276a5ee024cc5a5 100644 (file)
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -216,7 +216,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar9340-usb-phy", "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override";
+               reset-names = "phy-analog", "phy", "suspend-override";
                resets = <&rst 11>, <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index 0e52a80f6e776fe41b87d5db41cbafa13d48695e..ccfc3380beb3d872963b8bcb9adc1f9689936587 100644 (file)
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -60,7 +60,7 @@
                                reg = <0x18030000 0x100>;
                                #phy-cells = <0>;
 
-                               reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override";
+                               reset-names = "phy-analog", "phy", "suspend-override";
                                resets = <&rst 11>, <&rst 4>, <&rst 3>;
 
                                status = "disabled";

diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index f8318b8f65dc08c88e5df7a30e11735c03e8c1fe..719b965d1cf9a132ce0aca036adc7d25ce52b88d 100644 (file)
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -64,7 +64,7 @@
                                compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
                                reg = <0x18030000 4>, <0x18030004 4>;
 
-                               reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override";
+                               reset-names = "phy-analog", "phy", "suspend-override";
                                resets = <&rst 11>, <&rst 4>, <&rst 3>;
 
                                #phy-cells = <0>;
@@ -76,7 +76,7 @@
                                compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
                                reg = <0x18030010 4>, <0x18030014 4>;
 
-                               reset-names = "usb-phy-analog", "usb-phy", "usb-suspend-override";
+                               reset-names = "phy-analog", "phy", "suspend-override";
                                resets = <&rst2 11>, <&rst2 4>, <&rst2 3>;
 
                                #phy-cells = <0>;

diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index de685d053c75bffc902a4498dd638f7274361efd..9581e87421944d357c39c5019e6790d09e2585ef 100644 (file)
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -254,7 +254,7 @@
        usb_phy0: usb-phy {
                compatible = "qca,qca9560-usb-phy", "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;
@@ -265,7 +265,7 @@
        usb_phy1: usb-phy {
                compatible = "qca,qca9560-usb-phy", "qca,ar7200-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst2 4>, <&rst2 3>;
 
                #phy-cells = <0>;

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 98c399c9e0949f42ffcaad59bdd08b9997d813be..98879927cbee15397d4376eb868c5e81492f5390 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
@@ -128,7 +128,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      if (IS_ERR(priv->io_base))
 +              return PTR_ERR(priv->io_base);
 +
-+      priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy");
++      priv->rst_phy = devm_reset_control_get(&pdev->dev, "phy");
 +      if (IS_ERR(priv->rst_phy))
 +              return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing");
 +
@@ -250,17 +250,17 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +      if (!priv)
 +              return -ENOMEM;
 +
-+      priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy");
++      priv->rst_phy = devm_reset_control_get(&pdev->dev, "phy");
 +      if (IS_ERR(priv->rst_phy))
 +              return dev_err_probe(&pdev->dev, PTR_ERR(priv->rst_phy), "phy reset is missing");
 +
 +      priv->rst_phy_analog = devm_reset_control_get_optional(
-+              &pdev->dev, "usb-phy-analog");
++              &pdev->dev, "phy-analog");
 +      if (IS_ERR(priv->rst_phy_analog))
 +              return PTR_ERR(priv->rst_phy_analog);
 +
 +      priv->suspend_override = devm_reset_control_get_optional(
-+              &pdev->dev, "usb-suspend-override");
++              &pdev->dev, "suspend-override");
 +      if (IS_ERR(priv->suspend_override))
 +              return PTR_ERR(priv->suspend_override);
 +