ARM: dts: sun9i: Make sure the USB PHY resources are in the same order

While this is functional, it's a best practice to always have the clocks
and reset lines in order, in case we ever need to have compatibility code.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index 1d900f591d5f583dc5fea2e6fe55e8ffeb2ecac9..dd292a670921e8e18e25e5e4ba194644e5863656 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -387,16 +387,16 @@ ehci1: usb@a01000 {
                usbphy2: phy@a01800 {
                        compatible = "allwinner,sun9i-a80-usb-phy";
                        reg = <0x00a01800 0x4>;
-                       clocks = <&usb_clocks CLK_USB1_HSIC>,
+                       clocks = <&usb_clocks CLK_USB1_PHY>,
                                 <&usb_clocks CLK_USB_HSIC>,
-                                <&usb_clocks CLK_USB1_PHY>;
-                       clock-names = "hsic_480M",
+                                <&usb_clocks CLK_USB1_HSIC>;
+                       clock-names = "phy",
                                      "hsic_12M",
-                                     "phy";
-                       resets = <&usb_clocks RST_USB1_HSIC>,
-                                <&usb_clocks RST_USB1_PHY>;
-                       reset-names = "hsic",
-                                     "phy";
+                                     "hsic_480M";
+                       resets = <&usb_clocks RST_USB1_PHY>,
+                                <&usb_clocks RST_USB1_HSIC>;
+                       reset-names = "phy",
+                                     "hsic";
                        status = "disabled";
                        #phy-cells = <0>;
                        /* usb1 is always used with HSIC */
@@ -429,16 +429,16 @@ ohci2: usb@a02400 {
                usbphy3: phy@a02800 {
                        compatible = "allwinner,sun9i-a80-usb-phy";
                        reg = <0x00a02800 0x4>;
-                       clocks = <&usb_clocks CLK_USB2_HSIC>,
+                       clocks = <&usb_clocks CLK_USB2_PHY>,
                                 <&usb_clocks CLK_USB_HSIC>,
-                                <&usb_clocks CLK_USB2_PHY>;
-                       clock-names = "hsic_480M",
+                                <&usb_clocks CLK_USB2_HSIC>;
+                       clock-names = "phy",
                                      "hsic_12M",
-                                     "phy";
-                       resets = <&usb_clocks RST_USB2_HSIC>,
-                                <&usb_clocks RST_USB2_PHY>;
-                       reset-names = "hsic",
-                                     "phy";
+                                     "hsic_480M";
+                       resets = <&usb_clocks RST_USB2_PHY>,
+                                <&usb_clocks RST_USB2_HSIC>;
+                       reset-names = "phy",
+                                     "hsic";
                        status = "disabled";
                        #phy-cells = <0>;
                };