aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean MacLennan <smaclennan@pikatech.com>2008-04-28 23:27:46 -0400
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-05-29 08:06:56 -0400
commit0393cb615f369b6ea0e636dd4d1e25675657dc75 (patch)
tree4ca83e0c24b0d5e13005f28423ea8c2598451119
parent6f031101f5c6bb44762911909da575127f676eb8 (diff)
[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>
-rw-r--r--arch/powerpc/boot/dts/warp.dts55
1 files changed, 34 insertions, 21 deletions
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index c52e4fb89abf..340018cf16b7 100644
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -134,40 +134,33 @@
134 134
135 fpga@2,0 { 135 fpga@2,0 {
136 compatible = "pika,fpga"; 136 compatible = "pika,fpga";
137 reg = <0x00000002 0x00000000 0x00002200>; 137 reg = <0x00000002 0x00000000 0x00001000>;
138 interrupts = <0x18 0x8>; 138 interrupts = <0x18 0x8>;
139 interrupt-parent = <&UIC0>; 139 interrupt-parent = <&UIC0>;
140 }; 140 };
141 141
142 fpga@2,4000 {
143 compatible = "pika,fpga-sd";
144 reg = <0x00000002 0x00004000 0x00000A00>;
145 };
146
142 nor_flash@0,0 { 147 nor_flash@0,0 {
143 compatible = "amd,s29gl512n", "cfi-flash"; 148 compatible = "amd,s29gl032a", "cfi-flash";
144 bank-width = <2>; 149 bank-width = <2>;
145 reg = <0x00000000 0x00000000 0x04000000>; 150 reg = <0x00000000 0x00000000 0x00400000>;
146 #address-cells = <1>; 151 #address-cells = <1>;
147 #size-cells = <1>; 152 #size-cells = <1>;
148 partition@0 { 153 partition@300000 {
149 label = "kernel";
150 reg = <0x00000000 0x00180000>;
151 };
152 partition@180000 {
153 label = "root";
154 reg = <0x00180000 0x03480000>;
155 };
156 partition@3600000 {
157 label = "user";
158 reg = <0x03600000 0x00900000>;
159 };
160 partition@3f00000 {
161 label = "fpga"; 154 label = "fpga";
162 reg = <0x03f00000 0x00040000>; 155 reg = <0x0030000 0x00040000>;
163 }; 156 };
164 partition@3f40000 { 157 partition@340000 {
165 label = "env"; 158 label = "env";
166 reg = <0x03f40000 0x00040000>; 159 reg = <0x0340000 0x00040000>;
167 }; 160 };
168 partition@3f80000 { 161 partition@380000 {
169 label = "u-boot"; 162 label = "u-boot";
170 reg = <0x03f80000 0x00080000>; 163 reg = <0x0380000 0x00080000>;
171 }; 164 };
172 }; 165 };
173 }; 166 };
@@ -188,16 +181,36 @@
188 reg = <0xef600700 0x00000014>; 181 reg = <0xef600700 0x00000014>;
189 interrupt-parent = <&UIC0>; 182 interrupt-parent = <&UIC0>;
190 interrupts = <0x2 0x4>; 183 interrupts = <0x2 0x4>;
184 index = <0x0>;
185 #address-cells = <1>;
186 #size-cells = <0>;
187
188 ad7414@4a {
189 compatible = "adi,ad7414";
190 reg = <0x4a>;
191 interrupts = <0x19 0x8>;
192 interrupt-parent = <&UIC0>;
193 };
191 }; 194 };
192 195
193 GPIO0: gpio@ef600b00 { 196 GPIO0: gpio@ef600b00 {
194 compatible = "ibm,gpio-440ep"; 197 compatible = "ibm,gpio-440ep";
195 reg = <0xef600b00 0x00000048>; 198 reg = <0xef600b00 0x00000048>;
199 #gpio-cells = <2>;
200 gpio-controller;
196 }; 201 };
197 202
198 GPIO1: gpio@ef600c00 { 203 GPIO1: gpio@ef600c00 {
199 compatible = "ibm,gpio-440ep"; 204 compatible = "ibm,gpio-440ep";
200 reg = <0xef600c00 0x00000048>; 205 reg = <0xef600c00 0x00000048>;
206 #gpio-cells = <2>;
207 gpio-controller;
208
209 led@31 {
210 compatible = "linux,gpio-led";
211 linux,name = ":green:";
212 gpios = <&GPIO1 0x30 0>;
213 };
201 }; 214 };
202 215
203 ZMII0: emac-zmii@ef600d00 { 216 ZMII0: emac-zmii@ef600d00 {