Skip to content

Commit d2146cb

Browse files
cjgJosh Boyer
cjg
authored and
Josh Boyer
committed
powerpc/4xx: Convert Sam440ep DTS to dts-v1
This makes the sam440ep.dts dts-v1 compliant. Signed-off-by: Giuseppe Coviello <[email protected]> Signed-off-by: Josh Boyer <[email protected]>
1 parent b6014e1 commit d2146cb

File tree

1 file changed

+51
-50
lines changed

1 file changed

+51
-50
lines changed

‎arch/powerpc/boot/dts/sam440ep.dts

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
* any warranty of any kind, whether express or implied.
1414
*/
1515

16+
/dts-v1/;
17+
1618
/ {
1719
#address-cells = <2>;
1820
#size-cells = <1>;
1921
model = "acube,sam440ep";
2022
compatible = "acube,sam440ep";
21-
dcr-parent = <&/cpus/cpu@0>;
2223

2324
aliases {
2425
ethernet0 = &EMAC0;
@@ -39,10 +40,10 @@
3940
reg = <0>;
4041
clock-frequency = <0>; /* Filled in by zImage */
4142
timebase-frequency = <0>; /* Filled in by zImage */
42-
i-cache-line-size = <20>;
43-
d-cache-line-size = <20>;
44-
i-cache-size = <8000>;
45-
d-cache-size = <8000>;
43+
i-cache-line-size = <32>;
44+
d-cache-line-size = <32>;
45+
i-cache-size = <32768>;
46+
d-cache-size = <32768>;
4647
dcr-controller;
4748
dcr-access-method = "native";
4849
};
@@ -57,7 +58,7 @@
5758
compatible = "ibm,uic-440ep","ibm,uic";
5859
interrupt-controller;
5960
cell-index = <0>;
60-
dcr-reg = <0c0 009>;
61+
dcr-reg = <0x0c0 9>;
6162
#address-cells = <0>;
6263
#size-cells = <0>;
6364
#interrupt-cells = <2>;
@@ -67,22 +68,22 @@
6768
compatible = "ibm,uic-440ep","ibm,uic";
6869
interrupt-controller;
6970
cell-index = <1>;
70-
dcr-reg = <0d0 009>;
71+
dcr-reg = <0x0d0 9>;
7172
#address-cells = <0>;
7273
#size-cells = <0>;
7374
#interrupt-cells = <2>;
74-
interrupts = <1e 4 1f 4>; /* cascade */
75+
interrupts = <0x1e 4 0x1f 4>; /* cascade */
7576
interrupt-parent = <&UIC0>;
7677
};
7778

7879
SDR0: sdr {
7980
compatible = "ibm,sdr-440ep";
80-
dcr-reg = <00e 002>;
81+
dcr-reg = <0x00e 2>;
8182
};
8283

8384
CPR0: cpr {
8485
compatible = "ibm,cpr-440ep";
85-
dcr-reg = <00c 002>;
86+
dcr-reg = <0x00c 2>;
8687
};
8788

8889
plb {
@@ -94,26 +95,26 @@
9495

9596
SDRAM0: sdram {
9697
compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
97-
dcr-reg = <010 2>;
98+
dcr-reg = <0x010 2>;
9899
};
99100

100101
DMA0: dma {
101102
compatible = "ibm,dma-440ep", "ibm,dma-440gp";
102-
dcr-reg = <100 027>;
103+
dcr-reg = <0x100 0x027>;
103104
};
104105

105106
MAL0: mcmal {
106107
compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
107-
dcr-reg = <180 62>;
108+
dcr-reg = <0x180 0x062>;
108109
num-tx-chans = <4>;
109110
num-rx-chans = <2>;
110111
interrupt-parent = <&MAL0>;
111112
interrupts = <0 1 2 3 4>;
112113
#interrupt-cells = <1>;
113114
#address-cells = <0>;
114115
#size-cells = <0>;
115-
interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
116-
/*RXEOB*/ 1 &UIC0 b 4
116+
interrupt-map = </*TXEOB*/ 0 &UIC0 10 4
117+
/*RXEOB*/ 1 &UIC0 11 4
117118
/*SERR*/ 2 &UIC1 0 4
118119
/*TXDE*/ 3 &UIC1 1 4
119120
/*RXDE*/ 4 &UIC1 2 4>;
@@ -126,15 +127,15 @@
126127
/* Bamboo is oddball in the 44x world and doesn't use the ERPN
127128
* bits.
128129
*/
129-
ranges = <00000000 0 00000000 80000000
130-
80000000 0 80000000 80000000>;
130+
ranges = <0x00000000 0 0x00000000 0x80000000
131+
0x80000000 0 0x80000000 0x80000000>;
131132
interrupt-parent = <&UIC1>;
132133
interrupts = <7 4>;
133134
clock-frequency = <0>; /* Filled in by zImage */
134135

135136
EBC0: ebc {
136137
compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
137-
dcr-reg = <012 2>;
138+
dcr-reg = <0x012 2>;
138139
#address-cells = <2>;
139140
#size-cells = <1>;
140141
clock-frequency = <0>; /* Filled in by zImage */
@@ -145,19 +146,19 @@
145146
UART0: serial@ef600300 {
146147
device_type = "serial";
147148
compatible = "ns16550";
148-
reg = <ef600300 8>;
149-
virtual-reg = <ef600300>;
149+
reg = <0xef600300 8>;
150+
virtual-reg = <0xef600300>;
150151
clock-frequency = <0>; /* Filled in by zImage */
151-
current-speed = <1c200>;
152+
current-speed = <0x1c200>;
152153
interrupt-parent = <&UIC0>;
153154
interrupts = <0 4>;
154155
};
155156

156157
UART1: serial@ef600400 {
157158
device_type = "serial";
158159
compatible = "ns16550";
159-
reg = <ef600400 8>;
160-
virtual-reg = <ef600400>;
160+
reg = <0xef600400 8>;
161+
virtual-reg = <0xef600400>;
161162
clock-frequency = <0>;
162163
current-speed = <0>;
163164
interrupt-parent = <&UIC0>;
@@ -167,8 +168,8 @@
167168
UART2: serial@ef600500 {
168169
device_type = "serial";
169170
compatible = "ns16550";
170-
reg = <ef600500 8>;
171-
virtual-reg = <ef600500>;
171+
reg = <0xef600500 8>;
172+
virtual-reg = <0xef600500>;
172173
clock-frequency = <0>;
173174
current-speed = <0>;
174175
interrupt-parent = <&UIC0>;
@@ -178,8 +179,8 @@
178179
UART3: serial@ef600600 {
179180
device_type = "serial";
180181
compatible = "ns16550";
181-
reg = <ef600600 8>;
182-
virtual-reg = <ef600600>;
182+
reg = <0xef600600 8>;
183+
virtual-reg = <0xef600600>;
183184
clock-frequency = <0>;
184185
current-speed = <0>;
185186
interrupt-parent = <&UIC0>;
@@ -191,43 +192,43 @@
191192
#size-cells = <0>;
192193
compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
193194
index = <0>;
194-
reg = <ef600700 14>;
195+
reg = <0xef600700 0x14>;
195196
interrupt-parent = <&UIC0>;
196197
interrupts = <2 4>;
197198
rtc@68 {
198199
compatible = "stm,m41t80";
199-
reg = <68>;
200+
reg = <0x68>;
200201
};
201202
};
202203

203204
IIC1: i2c@ef600800 {
204205
compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
205206
index = <5>;
206-
reg = <ef600800 14>;
207+
reg = <0xef600800 0x14>;
207208
interrupt-parent = <&UIC0>;
208209
interrupts = <7 4>;
209210
};
210211

211212
ZMII0: emac-zmii@ef600d00 {
212213
compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
213-
reg = <ef600d00 c>;
214+
reg = <0xef600d00 0xc>;
214215
};
215216

216217
EMAC0: ethernet@ef600e00 {
217218
linux,network-index = <0>;
218219
device_type = "network";
219220
compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
220221
interrupt-parent = <&UIC1>;
221-
interrupts = <1c 4 1d 4>;
222-
reg = <ef600e00 70>;
222+
interrupts = <0x1c 4 0x1d 4>;
223+
reg = <0xef600e00 0x70>;
223224
local-mac-address = [000000000000];
224225
mal-device = <&MAL0>;
225226
mal-tx-channel = <0 1>;
226227
mal-rx-channel = <0>;
227228
cell-index = <0>;
228-
max-frame-size = <5dc>;
229-
rx-fifo-size = <1000>;
230-
tx-fifo-size = <800>;
229+
max-frame-size = <0x5dc>;
230+
rx-fifo-size = <0x1000>;
231+
tx-fifo-size = <0x800>;
231232
phy-mode = "rmii";
232233
phy-map = <00000000>;
233234
zmii-device = <&ZMII0>;
@@ -239,26 +240,26 @@
239240
device_type = "network";
240241
compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
241242
interrupt-parent = <&UIC1>;
242-
interrupts = <1e 4 1f 4>;
243-
reg = <ef600f00 70>;
243+
interrupts = <0x1e 4 0x1f 4>;
244+
reg = <0xef600f00 0x70>;
244245
local-mac-address = [000000000000];
245246
mal-device = <&MAL0>;
246247
mal-tx-channel = <2 3>;
247248
mal-rx-channel = <1>;
248249
cell-index = <1>;
249-
max-frame-size = <5dc>;
250-
rx-fifo-size = <1000>;
251-
tx-fifo-size = <800>;
250+
max-frame-size = <0x5dc>;
251+
rx-fifo-size = <0x1000>;
252+
tx-fifo-size = <0x800>;
252253
phy-mode = "rmii";
253254
phy-map = <00000000>;
254255
zmii-device = <&ZMII0>;
255256
zmii-channel = <1>;
256257
};
257258
usb@ef601000 {
258259
compatible = "ohci-be";
259-
reg = <ef601000 80>;
260+
reg = <0xef601000 0x80>;
260261
interrupts = <8 4 9 4>;
261-
interrupt-parent = < &UIC1 >;
262+
interrupt-parent = <&UIC1>;
262263
};
263264
};
264265

@@ -269,20 +270,20 @@
269270
#address-cells = <3>;
270271
compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
271272
primary;
272-
reg = <0 eec00000 8 /* Config space access */
273-
0 eed00000 4 /* IACK */
274-
0 eed00000 4 /* Special cycle */
275-
0 ef400000 40>; /* Internal registers */
273+
reg = <0 0xeec00000 8 /* Config space access */
274+
0 0xeed00000 4 /* IACK */
275+
0 0xeed00000 4 /* Special cycle */
276+
0 0xef400000 0x40>; /* Internal registers */
276277

277278
/* Outbound ranges, one memory and one IO,
278279
* later cannot be changed. Chip supports a second
279280
* IO range but we don't use it for now
280281
*/
281-
ranges = <02000000 0 a0000000 0 a0000000 0 20000000
282-
01000000 0 00000000 0 e8000000 0 00010000>;
282+
ranges = <0x02000000 0 0xa0000000 0 0xa0000000 0 0x20000000
283+
0x01000000 0 0x00000000 0 0xe8000000 0 0x00010000>;
283284

284285
/* 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>;
286287
};
287288
};
288289

0 commit comments

Comments
 (0)