From fa4d3ad951f712bbb421d4fe9826bf77cb66dd38 Mon Sep 17 00:00:00 2001
From: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Date: Wed, 18 Jan 2012 11:20:39 +0530
Subject: [PATCH] --- yaml --- r: 286722 b: refs/heads/master c:
 70a0ac66869907ce3914f26fe1eba984c9eb438e h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/boot/dts/p1020rdb.dtsi | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7d0197e2e2b5..313d51243acb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8b5a31877b93f7136ce8c22ce44930e39b41204
+refs/heads/master: 70a0ac66869907ce3914f26fe1eba984c9eb438e
diff --git a/trunk/arch/powerpc/boot/dts/p1020rdb.dtsi b/trunk/arch/powerpc/boot/dts/p1020rdb.dtsi
index b5bd86f4baf2..17559c4dc5d8 100644
--- a/trunk/arch/powerpc/boot/dts/p1020rdb.dtsi
+++ b/trunk/arch/powerpc/boot/dts/p1020rdb.dtsi
@@ -1,7 +1,7 @@
 /*
  * P1020 RDB Device Tree Source stub (no addresses or top-level ranges)
  *
- * Copyright 2011 Freescale Semiconductor Inc.
+ * Copyright 2011-2012 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -192,15 +192,12 @@
 		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.
+	/* USB2 is shared with localbus. It is used
+	   only in case of SPI and SD boot after
+	   appropriate device-tree fixup done by uboot */
 	usb@23000 {
 		phy_type = "ulpi";
 	};
-	*/
 
 	mdio@24000 {
 		phy0: ethernet-phy@0 {