[POWERPC] PIKA Warp: Update DTS to support Rev B boards

* Switched from 64M NOR/64M NAND to 4M NOR/256M NAND.
* Added led entries.
* Added fpga-sd entry.
* Added ad7414 entry.

Signed-off-by: Sean MacLennan <smaclennan@pikatech.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index c52e4fb..340018c 100644 (file)
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -134,40 +134,33 @@
 
                                fpga@2,0 {
                                        compatible = "pika,fpga";
-                                       reg = <0x00000002 0x00000000 0x00002200>;
+                                       reg = <0x00000002 0x00000000 0x00001000>;
                                        interrupts = <0x18 0x8>;
                                        interrupt-parent = <&UIC0>;
                                };
 
+                               fpga@2,4000 {
+                                       compatible = "pika,fpga-sd";
+                                       reg = <0x00000002 0x00004000 0x00000A00>;
+                               };
+
                                nor_flash@0,0 {
-                                       compatible = "amd,s29gl512n", "cfi-flash";
+                                       compatible = "amd,s29gl032a", "cfi-flash";
                                        bank-width = <2>;
-                                       reg = <0x00000000 0x00000000 0x04000000>;
+                                       reg = <0x00000000 0x00000000 0x00400000>;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       partition@0 {
-                                               label = "kernel";
-                                               reg = <0x00000000 0x00180000>;
-                                       };
-                                       partition@180000 {
-                                               label = "root";
-                                               reg = <0x00180000 0x03480000>;
-                                       };
-                                       partition@3600000 {
-                                               label = "user";
-                                               reg = <0x03600000 0x00900000>;
-                                       };
-                                       partition@3f00000 {
+                                       partition@300000 {
                                                label = "fpga";
-                                               reg = <0x03f00000 0x00040000>;
+                                               reg = <0x0030000 0x00040000>;
                                        };
-                                       partition@3f40000 {
+                                       partition@340000 {
                                                label = "env";
-                                               reg = <0x03f40000 0x00040000>;
+                                               reg = <0x0340000 0x00040000>;
                                        };
-                                       partition@3f80000 {
+                                       partition@380000 {
                                                label = "u-boot";
-                                               reg = <0x03f80000 0x00080000>;
+                                               reg = <0x0380000 0x00080000>;
                                        };
                                };
                        };
@@ -188,16 +181,36 @@
                                reg = <0xef600700 0x00000014>;
                                interrupt-parent = <&UIC0>;
                                interrupts = <0x2 0x4>;
+                               index = <0x0>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               ad7414@4a {
+                                       compatible = "adi,ad7414";
+                                       reg = <0x4a>;
+                                       interrupts = <0x19 0x8>;
+                                       interrupt-parent = <&UIC0>;
+                               };
                        };
 
                        GPIO0: gpio@ef600b00 {
                                compatible = "ibm,gpio-440ep";
                                reg = <0xef600b00 0x00000048>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
                        };
 
                        GPIO1: gpio@ef600c00 {
                                compatible = "ibm,gpio-440ep";
                                reg = <0xef600c00 0x00000048>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+
+                               led@31 {
+                                       compatible = "linux,gpio-led";
+                                       linux,name = ":green:";
+                                       gpios = <&GPIO1 0x30 0>;
+                               };
                        };
 
                        ZMII0: emac-zmii@ef600d00 {