1 files changed, 27 insertions, 26 deletions

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index fc7febc2b386..56a91106041b 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -209,7 +209,7 @@
                 compatible = "nvidia,tegra20-das";
                 reg = <0x70000c00 0x80>;
         };
-        
+
         tegra_ac97: ac97 {
                 compatible = "nvidia,tegra20-ac97";
                 reg = <0x70002000 0x200>;
@@ -299,6 +299,7 @@
                 reg = <0x7000a000 0x100>;
                 #pwm-cells = <2>;
                 clocks = <&tegra_car 17>;
+                status = "disabled";
         };
 
         rtc {
@@ -442,31 +443,6 @@
                 #size-cells = <0>;
         };
 
-        phy1: usb-phy@c5000400 {
-                compatible = "nvidia,tegra20-usb-phy";
-                reg = <0xc5000400 0x3c00>;
-                phy_type = "utmi";
-                nvidia,has-legacy-mode;
-                clocks = <&tegra_car 22>, <&tegra_car 127>;
-                clock-names = "phy", "pll_u";
-        };
-
-        phy2: usb-phy@c5004400 {
-                compatible = "nvidia,tegra20-usb-phy";
-                reg = <0xc5004400 0x3c00>;
-                phy_type = "ulpi";
-                clocks = <&tegra_car 94>, <&tegra_car 127>;
-                clock-names = "phy", "pll_u";
-        };
-
-        phy3: usb-phy@c5008400 {
-                compatible = "nvidia,tegra20-usb-phy";
-                reg = <0xc5008400 0x3C00>;
-                phy_type = "utmi";
-                clocks = <&tegra_car 22>, <&tegra_car 127>;
-                clock-names = "phy", "pll_u";
-        };
-
         usb@c5000000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5000000 0x4000>;
@@ -479,6 +455,15 @@
                 status = "disabled";
         };
 
+        phy1: usb-phy@c5000400 {
+                compatible = "nvidia,tegra20-usb-phy";
+                reg = <0xc5000400 0x3c00>;
+                phy_type = "utmi";
+                nvidia,has-legacy-mode;
+                clocks = <&tegra_car 22>, <&tegra_car 127>;
+                clock-names = "phy", "pll_u";
+        };
+
         usb@c5004000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5004000 0x4000>;
@@ -489,6 +474,14 @@
                 status = "disabled";
         };
 
+        phy2: usb-phy@c5004400 {
+                compatible = "nvidia,tegra20-usb-phy";
+                reg = <0xc5004400 0x3c00>;
+                phy_type = "ulpi";
+                clocks = <&tegra_car 93>, <&tegra_car 127>;
+                clock-names = "phy", "pll_u";
+        };
+
         usb@c5008000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5008000 0x4000>;
@@ -499,6 +492,14 @@
                 status = "disabled";
         };
 
+        phy3: usb-phy@c5008400 {
+                compatible = "nvidia,tegra20-usb-phy";
+                reg = <0xc5008400 0x3c00>;
+                phy_type = "utmi";
+                clocks = <&tegra_car 22>, <&tegra_car 127>;
+                clock-names = "phy", "pll_u";
+        };
+
         sdhci@c8000000 {
                 compatible = "nvidia,tegra20-sdhci";
                 reg = <0xc8000000 0x200>;