From 844518d2d5a71cfe764b2e868a366de89db388a7 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Sat, 15 Sep 2007 04:54:13 +1000
Subject: [PATCH] --- yaml --- r: 67366 b: refs/heads/master c:
 bf07f32d4332be50f5d4ef06307fb328257fcd1b h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/powerpc/boot/dts/walnut.dts | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cd1f85b6735c..94ea156b7a2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9ae994d8fce807fc90fb8e3b6ac8df1cc7dce6
+refs/heads/master: bf07f32d4332be50f5d4ef06307fb328257fcd1b
diff --git a/trunk/arch/powerpc/boot/dts/walnut.dts b/trunk/arch/powerpc/boot/dts/walnut.dts
index 27bef06db134..ec54f4e04ad6 100644
--- a/trunk/arch/powerpc/boot/dts/walnut.dts
+++ b/trunk/arch/powerpc/boot/dts/walnut.dts
@@ -137,6 +137,10 @@
 			dcr-reg = <012 2>;
 			#address-cells = <2>;
 			#size-cells = <1>;
+			/* The ranges property is supplied by the bootwrapper
+			 * and is based on the firmware's configuration of the
+			 * EBC bridge
+			 */
 			clock-frequency = <0>; /* Filled in by zImage */
 
 			sram@0,0 {
@@ -144,13 +148,16 @@
 			};
 
 			flash@0,80000 {
-				device_type = "rom";
-				compatible = "direct-mapped";
-				probe-type = "JEDEC";
+				compatible = "jedec-flash";
 				bank-width = <1>;
-				partitions = <0 80000>;
-				partition-names = "OpenBIOS";
 				reg = <0 80000 80000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				partition@0 {
+					label = "OpenBIOS";
+					reg = <0 80000>;
+					read-only;
+				};
 			};
 
 			ds1743@1,0 {