diff options
author | Giuseppe Coviello <cjg@cruxppc.org> | 2008-05-22 13:51:37 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-06-11 08:33:59 -0400 |
commit | d2146cb274e494dd14e50f5b4cdeb7a5e5af5421 (patch) | |
tree | fe0b776834ec781c38acf02befd41514a4181952 /arch/powerpc/boot/dts | |
parent | b6014e15bc38a33cf9591d33674dd870027cb623 (diff) |
powerpc/4xx: Convert Sam440ep DTS to dts-v1
This makes the sam440ep.dts dts-v1 compliant.
Signed-off-by: Giuseppe Coviello <gicoviello@gmail.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r-- | arch/powerpc/boot/dts/sam440ep.dts | 101 |
1 files changed, 51 insertions, 50 deletions
diff --git a/arch/powerpc/boot/dts/sam440ep.dts b/arch/powerpc/boot/dts/sam440ep.dts index b0984d550476..f0663be10421 100644 --- a/arch/powerpc/boot/dts/sam440ep.dts +++ b/arch/powerpc/boot/dts/sam440ep.dts | |||
@@ -13,12 +13,13 @@ | |||
13 | * any warranty of any kind, whether express or implied. | 13 | * any warranty of any kind, whether express or implied. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /dts-v1/; | ||
17 | |||
16 | / { | 18 | / { |
17 | #address-cells = <2>; | 19 | #address-cells = <2>; |
18 | #size-cells = <1>; | 20 | #size-cells = <1>; |
19 | model = "acube,sam440ep"; | 21 | model = "acube,sam440ep"; |
20 | compatible = "acube,sam440ep"; | 22 | compatible = "acube,sam440ep"; |
21 | dcr-parent = <&/cpus/cpu@0>; | ||
22 | 23 | ||
23 | aliases { | 24 | aliases { |
24 | ethernet0 = &EMAC0; | 25 | ethernet0 = &EMAC0; |
@@ -39,10 +40,10 @@ | |||
39 | reg = <0>; | 40 | reg = <0>; |
40 | clock-frequency = <0>; /* Filled in by zImage */ | 41 | clock-frequency = <0>; /* Filled in by zImage */ |
41 | timebase-frequency = <0>; /* Filled in by zImage */ | 42 | timebase-frequency = <0>; /* Filled in by zImage */ |
42 | i-cache-line-size = <20>; | 43 | i-cache-line-size = <32>; |
43 | d-cache-line-size = <20>; | 44 | d-cache-line-size = <32>; |
44 | i-cache-size = <8000>; | 45 | i-cache-size = <32768>; |
45 | d-cache-size = <8000>; | 46 | d-cache-size = <32768>; |
46 | dcr-controller; | 47 | dcr-controller; |
47 | dcr-access-method = "native"; | 48 | dcr-access-method = "native"; |
48 | }; | 49 | }; |
@@ -57,7 +58,7 @@ | |||
57 | compatible = "ibm,uic-440ep","ibm,uic"; | 58 | compatible = "ibm,uic-440ep","ibm,uic"; |
58 | interrupt-controller; | 59 | interrupt-controller; |
59 | cell-index = <0>; | 60 | cell-index = <0>; |
60 | dcr-reg = <0c0 009>; | 61 | dcr-reg = <0x0c0 9>; |
61 | #address-cells = <0>; | 62 | #address-cells = <0>; |
62 | #size-cells = <0>; | 63 | #size-cells = <0>; |
63 | #interrupt-cells = <2>; | 64 | #interrupt-cells = <2>; |
@@ -67,22 +68,22 @@ | |||
67 | compatible = "ibm,uic-440ep","ibm,uic"; | 68 | compatible = "ibm,uic-440ep","ibm,uic"; |
68 | interrupt-controller; | 69 | interrupt-controller; |
69 | cell-index = <1>; | 70 | cell-index = <1>; |
70 | dcr-reg = <0d0 009>; | 71 | dcr-reg = <0x0d0 9>; |
71 | #address-cells = <0>; | 72 | #address-cells = <0>; |
72 | #size-cells = <0>; | 73 | #size-cells = <0>; |
73 | #interrupt-cells = <2>; | 74 | #interrupt-cells = <2>; |
74 | interrupts = <1e 4 1f 4>; /* cascade */ | 75 | interrupts = <0x1e 4 0x1f 4>; /* cascade */ |
75 | interrupt-parent = <&UIC0>; | 76 | interrupt-parent = <&UIC0>; |
76 | }; | 77 | }; |
77 | 78 | ||
78 | SDR0: sdr { | 79 | SDR0: sdr { |
79 | compatible = "ibm,sdr-440ep"; | 80 | compatible = "ibm,sdr-440ep"; |
80 | dcr-reg = <00e 002>; | 81 | dcr-reg = <0x00e 2>; |
81 | }; | 82 | }; |
82 | 83 | ||
83 | CPR0: cpr { | 84 | CPR0: cpr { |
84 | compatible = "ibm,cpr-440ep"; | 85 | compatible = "ibm,cpr-440ep"; |
85 | dcr-reg = <00c 002>; | 86 | dcr-reg = <0x00c 2>; |
86 | }; | 87 | }; |
87 | 88 | ||
88 | plb { | 89 | plb { |
@@ -94,17 +95,17 @@ | |||
94 | 95 | ||
95 | SDRAM0: sdram { | 96 | SDRAM0: sdram { |
96 | compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; | 97 | compatible = "ibm,sdram-440ep", "ibm,sdram-405gp"; |
97 | dcr-reg = <010 2>; | 98 | dcr-reg = <0x010 2>; |
98 | }; | 99 | }; |
99 | 100 | ||
100 | DMA0: dma { | 101 | DMA0: dma { |
101 | compatible = "ibm,dma-440ep", "ibm,dma-440gp"; | 102 | compatible = "ibm,dma-440ep", "ibm,dma-440gp"; |
102 | dcr-reg = <100 027>; | 103 | dcr-reg = <0x100 0x027>; |
103 | }; | 104 | }; |
104 | 105 | ||
105 | MAL0: mcmal { | 106 | MAL0: mcmal { |
106 | compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; | 107 | compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal"; |
107 | dcr-reg = <180 62>; | 108 | dcr-reg = <0x180 0x062>; |
108 | num-tx-chans = <4>; | 109 | num-tx-chans = <4>; |
109 | num-rx-chans = <2>; | 110 | num-rx-chans = <2>; |
110 | interrupt-parent = <&MAL0>; | 111 | interrupt-parent = <&MAL0>; |
@@ -112,8 +113,8 @@ | |||
112 | #interrupt-cells = <1>; | 113 | #interrupt-cells = <1>; |
113 | #address-cells = <0>; | 114 | #address-cells = <0>; |
114 | #size-cells = <0>; | 115 | #size-cells = <0>; |
115 | interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 | 116 | interrupt-map = </*TXEOB*/ 0 &UIC0 10 4 |
116 | /*RXEOB*/ 1 &UIC0 b 4 | 117 | /*RXEOB*/ 1 &UIC0 11 4 |
117 | /*SERR*/ 2 &UIC1 0 4 | 118 | /*SERR*/ 2 &UIC1 0 4 |
118 | /*TXDE*/ 3 &UIC1 1 4 | 119 | /*TXDE*/ 3 &UIC1 1 4 |
119 | /*RXDE*/ 4 &UIC1 2 4>; | 120 | /*RXDE*/ 4 &UIC1 2 4>; |
@@ -126,15 +127,15 @@ | |||
126 | /* Bamboo is oddball in the 44x world and doesn't use the ERPN | 127 | /* Bamboo is oddball in the 44x world and doesn't use the ERPN |
127 | * bits. | 128 | * bits. |
128 | */ | 129 | */ |
129 | ranges = <00000000 0 00000000 80000000 | 130 | ranges = <0x00000000 0 0x00000000 0x80000000 |
130 | 80000000 0 80000000 80000000>; | 131 | 0x80000000 0 0x80000000 0x80000000>; |
131 | interrupt-parent = <&UIC1>; | 132 | interrupt-parent = <&UIC1>; |
132 | interrupts = <7 4>; | 133 | interrupts = <7 4>; |
133 | clock-frequency = <0>; /* Filled in by zImage */ | 134 | clock-frequency = <0>; /* Filled in by zImage */ |
134 | 135 | ||
135 | EBC0: ebc { | 136 | EBC0: ebc { |
136 | compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; | 137 | compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc"; |
137 | dcr-reg = <012 2>; | 138 | dcr-reg = <0x012 2>; |
138 | #address-cells = <2>; | 139 | #address-cells = <2>; |
139 | #size-cells = <1>; | 140 | #size-cells = <1>; |
140 | clock-frequency = <0>; /* Filled in by zImage */ | 141 | clock-frequency = <0>; /* Filled in by zImage */ |
@@ -145,10 +146,10 @@ | |||
145 | UART0: serial@ef600300 { | 146 | UART0: serial@ef600300 { |
146 | device_type = "serial"; | 147 | device_type = "serial"; |
147 | compatible = "ns16550"; | 148 | compatible = "ns16550"; |
148 | reg = <ef600300 8>; | 149 | reg = <0xef600300 8>; |
149 | virtual-reg = <ef600300>; | 150 | virtual-reg = <0xef600300>; |
150 | clock-frequency = <0>; /* Filled in by zImage */ | 151 | clock-frequency = <0>; /* Filled in by zImage */ |
151 | current-speed = <1c200>; | 152 | current-speed = <0x1c200>; |
152 | interrupt-parent = <&UIC0>; | 153 | interrupt-parent = <&UIC0>; |
153 | interrupts = <0 4>; | 154 | interrupts = <0 4>; |
154 | }; | 155 | }; |
@@ -156,8 +157,8 @@ | |||
156 | UART1: serial@ef600400 { | 157 | UART1: serial@ef600400 { |
157 | device_type = "serial"; | 158 | device_type = "serial"; |
158 | compatible = "ns16550"; | 159 | compatible = "ns16550"; |
159 | reg = <ef600400 8>; | 160 | reg = <0xef600400 8>; |
160 | virtual-reg = <ef600400>; | 161 | virtual-reg = <0xef600400>; |
161 | clock-frequency = <0>; | 162 | clock-frequency = <0>; |
162 | current-speed = <0>; | 163 | current-speed = <0>; |
163 | interrupt-parent = <&UIC0>; | 164 | interrupt-parent = <&UIC0>; |
@@ -167,8 +168,8 @@ | |||
167 | UART2: serial@ef600500 { | 168 | UART2: serial@ef600500 { |
168 | device_type = "serial"; | 169 | device_type = "serial"; |
169 | compatible = "ns16550"; | 170 | compatible = "ns16550"; |
170 | reg = <ef600500 8>; | 171 | reg = <0xef600500 8>; |
171 | virtual-reg = <ef600500>; | 172 | virtual-reg = <0xef600500>; |
172 | clock-frequency = <0>; | 173 | clock-frequency = <0>; |
173 | current-speed = <0>; | 174 | current-speed = <0>; |
174 | interrupt-parent = <&UIC0>; | 175 | interrupt-parent = <&UIC0>; |
@@ -178,8 +179,8 @@ | |||
178 | UART3: serial@ef600600 { | 179 | UART3: serial@ef600600 { |
179 | device_type = "serial"; | 180 | device_type = "serial"; |
180 | compatible = "ns16550"; | 181 | compatible = "ns16550"; |
181 | reg = <ef600600 8>; | 182 | reg = <0xef600600 8>; |
182 | virtual-reg = <ef600600>; | 183 | virtual-reg = <0xef600600>; |
183 | clock-frequency = <0>; | 184 | clock-frequency = <0>; |
184 | current-speed = <0>; | 185 | current-speed = <0>; |
185 | interrupt-parent = <&UIC0>; | 186 | interrupt-parent = <&UIC0>; |
@@ -191,26 +192,26 @@ | |||
191 | #size-cells = <0>; | 192 | #size-cells = <0>; |
192 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; | 193 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; |
193 | index = <0>; | 194 | index = <0>; |
194 | reg = <ef600700 14>; | 195 | reg = <0xef600700 0x14>; |
195 | interrupt-parent = <&UIC0>; | 196 | interrupt-parent = <&UIC0>; |
196 | interrupts = <2 4>; | 197 | interrupts = <2 4>; |
197 | rtc@68 { | 198 | rtc@68 { |
198 | compatible = "stm,m41t80"; | 199 | compatible = "stm,m41t80"; |
199 | reg = <68>; | 200 | reg = <0x68>; |
200 | }; | 201 | }; |
201 | }; | 202 | }; |
202 | 203 | ||
203 | IIC1: i2c@ef600800 { | 204 | IIC1: i2c@ef600800 { |
204 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; | 205 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; |
205 | index = <5>; | 206 | index = <5>; |
206 | reg = <ef600800 14>; | 207 | reg = <0xef600800 0x14>; |
207 | interrupt-parent = <&UIC0>; | 208 | interrupt-parent = <&UIC0>; |
208 | interrupts = <7 4>; | 209 | interrupts = <7 4>; |
209 | }; | 210 | }; |
210 | 211 | ||
211 | ZMII0: emac-zmii@ef600d00 { | 212 | ZMII0: emac-zmii@ef600d00 { |
212 | compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; | 213 | compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; |
213 | reg = <ef600d00 c>; | 214 | reg = <0xef600d00 0xc>; |
214 | }; | 215 | }; |
215 | 216 | ||
216 | EMAC0: ethernet@ef600e00 { | 217 | EMAC0: ethernet@ef600e00 { |
@@ -218,16 +219,16 @@ | |||
218 | device_type = "network"; | 219 | device_type = "network"; |
219 | compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; | 220 | compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; |
220 | interrupt-parent = <&UIC1>; | 221 | interrupt-parent = <&UIC1>; |
221 | interrupts = <1c 4 1d 4>; | 222 | interrupts = <0x1c 4 0x1d 4>; |
222 | reg = <ef600e00 70>; | 223 | reg = <0xef600e00 0x70>; |
223 | local-mac-address = [000000000000]; | 224 | local-mac-address = [000000000000]; |
224 | mal-device = <&MAL0>; | 225 | mal-device = <&MAL0>; |
225 | mal-tx-channel = <0 1>; | 226 | mal-tx-channel = <0 1>; |
226 | mal-rx-channel = <0>; | 227 | mal-rx-channel = <0>; |
227 | cell-index = <0>; | 228 | cell-index = <0>; |
228 | max-frame-size = <5dc>; | 229 | max-frame-size = <0x5dc>; |
229 | rx-fifo-size = <1000>; | 230 | rx-fifo-size = <0x1000>; |
230 | tx-fifo-size = <800>; | 231 | tx-fifo-size = <0x800>; |
231 | phy-mode = "rmii"; | 232 | phy-mode = "rmii"; |
232 | phy-map = <00000000>; | 233 | phy-map = <00000000>; |
233 | zmii-device = <&ZMII0>; | 234 | zmii-device = <&ZMII0>; |
@@ -239,16 +240,16 @@ | |||
239 | device_type = "network"; | 240 | device_type = "network"; |
240 | compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; | 241 | compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; |
241 | interrupt-parent = <&UIC1>; | 242 | interrupt-parent = <&UIC1>; |
242 | interrupts = <1e 4 1f 4>; | 243 | interrupts = <0x1e 4 0x1f 4>; |
243 | reg = <ef600f00 70>; | 244 | reg = <0xef600f00 0x70>; |
244 | local-mac-address = [000000000000]; | 245 | local-mac-address = [000000000000]; |
245 | mal-device = <&MAL0>; | 246 | mal-device = <&MAL0>; |
246 | mal-tx-channel = <2 3>; | 247 | mal-tx-channel = <2 3>; |
247 | mal-rx-channel = <1>; | 248 | mal-rx-channel = <1>; |
248 | cell-index = <1>; | 249 | cell-index = <1>; |
249 | max-frame-size = <5dc>; | 250 | max-frame-size = <0x5dc>; |
250 | rx-fifo-size = <1000>; | 251 | rx-fifo-size = <0x1000>; |
251 | tx-fifo-size = <800>; | 252 | tx-fifo-size = <0x800>; |
252 | phy-mode = "rmii"; | 253 | phy-mode = "rmii"; |
253 | phy-map = <00000000>; | 254 | phy-map = <00000000>; |
254 | zmii-device = <&ZMII0>; | 255 | zmii-device = <&ZMII0>; |
@@ -256,9 +257,9 @@ | |||
256 | }; | 257 | }; |
257 | usb@ef601000 { | 258 | usb@ef601000 { |
258 | compatible = "ohci-be"; | 259 | compatible = "ohci-be"; |
259 | reg = <ef601000 80>; | 260 | reg = <0xef601000 0x80>; |
260 | interrupts = <8 4 9 4>; | 261 | interrupts = <8 4 9 4>; |
261 | interrupt-parent = < &UIC1 >; | 262 | interrupt-parent = <&UIC1>; |
262 | }; | 263 | }; |
263 | }; | 264 | }; |
264 | 265 | ||
@@ -269,20 +270,20 @@ | |||
269 | #address-cells = <3>; | 270 | #address-cells = <3>; |
270 | compatible = "ibm,plb440ep-pci", "ibm,plb-pci"; | 271 | compatible = "ibm,plb440ep-pci", "ibm,plb-pci"; |
271 | primary; | 272 | primary; |
272 | reg = <0 eec00000 8 /* Config space access */ | 273 | reg = <0 0xeec00000 8 /* Config space access */ |
273 | 0 eed00000 4 /* IACK */ | 274 | 0 0xeed00000 4 /* IACK */ |
274 | 0 eed00000 4 /* Special cycle */ | 275 | 0 0xeed00000 4 /* Special cycle */ |
275 | 0 ef400000 40>; /* Internal registers */ | 276 | 0 0xef400000 0x40>; /* Internal registers */ |
276 | 277 | ||
277 | /* Outbound ranges, one memory and one IO, | 278 | /* Outbound ranges, one memory and one IO, |
278 | * later cannot be changed. Chip supports a second | 279 | * later cannot be changed. Chip supports a second |
279 | * IO range but we don't use it for now | 280 | * IO range but we don't use it for now |
280 | */ | 281 | */ |
281 | ranges = <02000000 0 a0000000 0 a0000000 0 20000000 | 282 | ranges = <0x02000000 0 0xa0000000 0 0xa0000000 0 0x20000000 |
282 | 01000000 0 00000000 0 e8000000 0 00010000>; | 283 | 0x01000000 0 0x00000000 0 0xe8000000 0 0x00010000>; |
283 | 284 | ||
284 | /* Inbound 2GB range starting at 0 */ | 285 | /* Inbound 2GB range starting at 0 */ |
285 | dma-ranges = <42000000 0 0 0 0 0 80000000>; | 286 | dma-ranges = <0x42000000 0 0 0 0 0 0x80000000>; |
286 | }; | 287 | }; |
287 | }; | 288 | }; |
288 | 289 | ||