Patchwork [v2] powerpc/86xx: Update GE Fanuc sbc310 DTS

login
register
mail settings
Submitter Martyn Welch
Date July 30, 2009, 8:13 a.m.
Message ID <20090730080651.27000.18194.stgit@ES-J7S4D2J.amer.consind.ge.com>
Download mbox | patch
Permalink /patch/30376/
State Accepted
Delegated to: Kumar Gala
Headers show

Comments

Martyn Welch - July 30, 2009, 8:13 a.m.
Update GE Fanuc DTS to match the alterations suggested during the merge of
the ppc9a DTS in commit 740d36ae6344f38c4da64c2ede765d7d2dd1f132

Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
---

v2: Fixed run on message.

Kumar: I think the problem may be that this patch depends on a previous patch:

http://patchwork.ozlabs.org/patch/29335/

Martyn

 arch/powerpc/boot/dts/gef_sbc310.dts |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
Kumar Gala - Aug. 7, 2009, 2:38 a.m.
On Jul 30, 2009, at 3:13 AM, Martyn Welch wrote:

> Update GE Fanuc DTS to match the alterations suggested during the  
> merge of
> the ppc9a DTS in commit 740d36ae6344f38c4da64c2ede765d7d2dd1f132
>
> Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
> ---
>
> v2: Fixed run on message.
>
> Kumar: I think the problem may be that this patch depends on a  
> previous patch:
>
> http://patchwork.ozlabs.org/patch/29335/
>
> Martyn
>
> arch/powerpc/boot/dts/gef_sbc310.dts |   29 ++++++++++++ 
> +----------------
> 1 files changed, 13 insertions(+), 16 deletions(-)

applied to next

For some reason in my tree the extra line at the end had already been  
removed.

- k
Kumar Gala - Aug. 7, 2009, 2:45 a.m.
On Aug 6, 2009, at 9:38 PM, Kumar Gala wrote:

>
> On Jul 30, 2009, at 3:13 AM, Martyn Welch wrote:
>
>> Update GE Fanuc DTS to match the alterations suggested during the  
>> merge of
>> the ppc9a DTS in commit 740d36ae6344f38c4da64c2ede765d7d2dd1f132
>>
>> Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
>> ---
>>
>> v2: Fixed run on message.
>>
>> Kumar: I think the problem may be that this patch depends on a  
>> previous patch:
>>
>> http://patchwork.ozlabs.org/patch/29335/
>>
>> Martyn
>>
>> arch/powerpc/boot/dts/gef_sbc310.dts |   29 ++++++++++++ 
>> +----------------
>> 1 files changed, 13 insertions(+), 16 deletions(-)
>
> applied to next
>
> For some reason in my tree the extra line at the end had already  
> been removed.

Ignore this, I see what you meant by the earlier patch...

- k

Patch

diff --git a/arch/powerpc/boot/dts/gef_sbc310.dts b/arch/powerpc/boot/dts/gef_sbc310.dts
index 7810ea9..2107d3c 100644
--- a/arch/powerpc/boot/dts/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/gef_sbc310.dts
@@ -83,34 +83,34 @@ 
 
 		/* flash@0,0 is a mirror of part of the memory in flash@1,0
 		flash@0,0 {
-			compatible = "cfi-flash";
-			reg = <0 0 0x01000000>;
+			compatible = "gef,sbc310-firmware-mirror", "cfi-flash";
+			reg = <0x0 0x0 0x01000000>;
 			bank-width = <2>;
 			device-width = <2>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			partition@0 {
 				label = "firmware";
-				reg = <0x00000000 0x01000000>;
+				reg = <0x0 0x01000000>;
 				read-only;
 			};
 		};
 		*/
 
 		flash@1,0 {
-			compatible = "cfi-flash";
-			reg = <1 0 0x8000000>;
+			compatible = "gef,sbc310-paged-flash", "cfi-flash";
+			reg = <0x1 0x0 0x8000000>;
 			bank-width = <2>;
 			device-width = <2>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			partition@0 {
 				label = "user";
-				reg = <0x00000000 0x07800000>;
+				reg = <0x0 0x7800000>;
 			};
 			partition@7800000 {
 				label = "firmware";
-				reg = <0x07800000 0x00800000>;
+				reg = <0x7800000 0x800000>;
 				read-only;
 			};
 		};
@@ -121,18 +121,16 @@ 
 		};
 
 		wdt@4,2000 {
-			#interrupt-cells = <2>;
-			device_type = "watchdog";
-			compatible = "gef,fpga-wdt";
+			compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
+				"gef,fpga-wdt";
 			reg = <0x4 0x2000 0x8>;
 			interrupts = <0x1a 0x4>;
 			interrupt-parent = <&gef_pic>;
 		};
 /*
 		wdt@4,2010 {
-			#interrupt-cells = <2>;
-			device_type = "watchdog";
-			compatible = "gef,fpga-wdt";
+			compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
+				"gef,fpga-wdt";
 			reg = <0x4 0x2010 0x8>;
 			interrupts = <0x1b 0x4>;
 			interrupt-parent = <&gef_pic>;
@@ -141,7 +139,7 @@ 
 		gef_pic: pic@4,4000 {
 			#interrupt-cells = <1>;
 			interrupt-controller;
-			compatible = "gef,fpga-pic";
+			compatible = "gef,sbc310-fpga-pic", "gef,fpga-pic";
 			reg = <0x4 0x4000 0x20>;
 			interrupts = <0x8
 				      0x9>;
@@ -161,7 +159,7 @@ 
 		#size-cells = <1>;
 		#interrupt-cells = <2>;
 		device_type = "soc";
-		compatible = "simple-bus";
+		compatible = "fsl,mpc8641-soc", "simple-bus";
 		ranges = <0x0 0xfef00000 0x00100000>;
 		bus-frequency = <33333333>;
 
@@ -412,5 +410,4 @@ 
 				  0x0 0x00400000>;
 		};
 	};
-
 };