From 4222ca6ceee9037a4de5dd4e138b42a669870e34 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@mvista.com>
Date: Thu, 22 Apr 2010 19:44:47 +0400
Subject: [PATCH] --- yaml --- r: 196649 b: refs/heads/master c:
 0aedc0085146131da5b04476aab21834b1403b31 h: refs/heads/master i:   196647:
 994ff16618dbd9678322cd0c4604de767fab1ab8 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/powerpc/boot/dts/p1020rdb.dts | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dffd3a5b3711..c5a780b83485 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7541ef78c3b83e906b580f005207000545cf770a
+refs/heads/master: 0aedc0085146131da5b04476aab21834b1403b31
diff --git a/trunk/arch/powerpc/boot/dts/p1020rdb.dts b/trunk/arch/powerpc/boot/dts/p1020rdb.dts
index 49848c545d86..22f64b62d7f6 100644
--- a/trunk/arch/powerpc/boot/dts/p1020rdb.dts
+++ b/trunk/arch/powerpc/boot/dts/p1020rdb.dts
@@ -475,6 +475,11 @@
 			phy_type = "ulpi";
 		};
 
+		/* USB2 is shared with localbus, so it must be disabled
+		   by default. We can't put 'status = "disabled";' here
+		   since U-Boot doesn't clear the status property when
+		   it enables USB2. OTOH, U-Boot does create a new node
+		   when there isn't any. So, just comment it out.
 		usb@23000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -484,6 +489,7 @@
 			interrupts = <46 0x2>;
 			phy_type = "ulpi";
 		};
+		*/
 
 		sdhci@2e000 {
 			compatible = "fsl,p1020-esdhc", "fsl,esdhc";