MIPS: ath79: Fix the USB PHY reset names

The binding for the USB PHY went thru before the driver. However the
new version of the driver now use the PHY core support for reset, and
this expect the reset to be named "phy". So remove the "usb-" prefix
from the the reset names.

Signed-off-by: Alban Bedel <albeu@free.fr>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/15282/
Cc: linux-kernel@vger.kernel.org
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Cc: devicetree@vger.kernel.org
Cc: linux-mips@linux-mips.org

diff --git a/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt b/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
index cafe2197dad95f3d273d5c1a107db1c48d1962ee..c3a29c5feea3792a23922ff55ab1260bf7cda172 100644 (file)
--- a/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
+++ b/Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
@@ -3,7 +3,7 @@
 Required properties:
 - compatible: "qca,ar7100-usb-phy"
 - #phys-cells: should be 0
-- reset-names: "usb-phy"[, "usb-suspend-override"]
+- reset-names: "phy"[, "suspend-override"]
 - resets: references to the reset controllers
 
 Example:
@@ -11,7 +11,7 @@ Example:
        usb-phy {
                compatible = "qca,ar7100-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/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index 1fe561c5f90e76f5558231a8af4d59576b2ae282..61dcfa5b6ca78a843459d1c82a4d60289df11d32 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -161,7 +161,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7100-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/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
index efd5f07222060c8a2c9abfe4c2cc49d2f3675d73..2bae201aa365106ac262865b0ba407fe36905599 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9331.dtsi
+++ b/arch/mips/boot/dts/qca/ar9331.dtsi
@@ -146,7 +146,7 @@
        usb_phy: usb-phy {
                compatible = "qca,ar7100-usb-phy";
 
-               reset-names = "usb-phy", "usb-suspend-override";
+               reset-names = "phy", "suspend-override";
                resets = <&rst 4>, <&rst 3>;
 
                #phy-cells = <0>;