diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2011-11-17 09:01:40 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-11-24 03:01:39 -0500 |
commit | 54986964c13c72f0a6cf58855ee376a12e21d2d7 (patch) | |
tree | 8f1c8f52dea198bb47f354887d333e1626138631 /arch/powerpc/boot | |
parent | 03f4201bd44e7d3ca7dc26b30d4251a07c77e9f2 (diff) |
powerpc/85xx: Update SRIO device tree nodes
Update all dts files that support SRIO controllers to match the new
fsl,srio device tree binding.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi | 25 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi | 28 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 20 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 20 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 26 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 20 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi | 68 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8569mds.dts | 7 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 69 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p2041rdb.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p3041ds.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p4080ds.dts | 12 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p5020ds.dts | 11 |
15 files changed, 285 insertions, 49 deletions
diff --git a/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi index 6a9cca865774..64e7075a9cd4 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi | |||
@@ -82,18 +82,19 @@ | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | &rio { | 84 | &rio { |
85 | compatible = "fsl,srio"; | ||
86 | interrupts = <48 2 0 0>; | ||
85 | #address-cells = <2>; | 87 | #address-cells = <2>; |
86 | #size-cells = <2>; | 88 | #size-cells = <2>; |
87 | compatible = "fsl,mpc8568-rapidio", "fsl,rapidio-delta"; | 89 | fsl,srio-rmu-handle = <&rmu>; |
88 | interrupts = <48 2 0 0 /* error */ | 90 | sleep = <&pmc 0x00080000>; |
89 | 49 2 0 0 /* bell_outb */ | 91 | ranges; |
90 | 50 2 0 0 /* bell_inb */ | 92 | |
91 | 53 2 0 0 /* msg1_tx */ | 93 | port1 { |
92 | 54 2 0 0 /* msg1_rx */ | 94 | #address-cells = <2>; |
93 | 55 2 0 0 /* msg2_tx */ | 95 | #size-cells = <2>; |
94 | 56 2 0 0 /* msg2_rx */>; | 96 | cell-index = <1>; |
95 | sleep = <&pmc 0x00080000 /* controller */ | 97 | }; |
96 | &pmc 0x00040000>; /* message unit */ | ||
97 | }; | 98 | }; |
98 | 99 | ||
99 | &soc { | 100 | &soc { |
@@ -178,6 +179,10 @@ | |||
178 | }; | 179 | }; |
179 | 180 | ||
180 | /include/ "pq3-mpic.dtsi" | 181 | /include/ "pq3-mpic.dtsi" |
182 | /include/ "pq3-rmu-0.dtsi" | ||
183 | rmu@d3000 { | ||
184 | sleep = <&pmc 0x00040000>; | ||
185 | }; | ||
181 | 186 | ||
182 | global-utilities@e0000 { | 187 | global-utilities@e0000 { |
183 | #address-cells = <1>; | 188 | #address-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi index eb75a18e61e4..3e6346a4a183 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi | |||
@@ -70,17 +70,25 @@ | |||
70 | }; | 70 | }; |
71 | 71 | ||
72 | &rio { | 72 | &rio { |
73 | compatible = "fsl,srio"; | ||
74 | interrupts = <48 2 0 0>; | ||
73 | #address-cells = <2>; | 75 | #address-cells = <2>; |
74 | #size-cells = <2>; | 76 | #size-cells = <2>; |
75 | compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta"; | 77 | fsl,srio-rmu-handle = <&rmu>; |
76 | interrupts = <48 2 0 0 /* error */ | ||
77 | 49 2 0 0 /* bell_outb */ | ||
78 | 50 2 0 0 /* bell_inb */ | ||
79 | 53 2 0 0 /* msg1_tx */ | ||
80 | 54 2 0 0 /* msg1_rx */ | ||
81 | 55 2 0 0 /* msg2_tx */ | ||
82 | 56 2 0 0 /* msg2_rx */>; | ||
83 | sleep = <&pmc 0x00080000>; | 78 | sleep = <&pmc 0x00080000>; |
79 | ranges; | ||
80 | |||
81 | port1 { | ||
82 | #address-cells = <2>; | ||
83 | #size-cells = <2>; | ||
84 | cell-index = <1>; | ||
85 | }; | ||
86 | |||
87 | port2 { | ||
88 | #address-cells = <2>; | ||
89 | #size-cells = <2>; | ||
90 | cell-index = <2>; | ||
91 | }; | ||
84 | }; | 92 | }; |
85 | 93 | ||
86 | &soc { | 94 | &soc { |
@@ -159,6 +167,10 @@ | |||
159 | }; | 167 | }; |
160 | 168 | ||
161 | /include/ "pq3-mpic.dtsi" | 169 | /include/ "pq3-mpic.dtsi" |
170 | /include/ "pq3-rmu-0.dtsi" | ||
171 | rmu@d3000 { | ||
172 | sleep = <&pmc 0x00040000>; | ||
173 | }; | ||
162 | 174 | ||
163 | global-utilities@e0000 { | 175 | global-utilities@e0000 { |
164 | #address-cells = <1>; | 176 | #address-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi index 8d037cf79c94..234a399ddeb2 100644 --- a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | |||
@@ -120,6 +120,26 @@ | |||
120 | }; | 120 | }; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | &rio { | ||
124 | compatible = "fsl,srio"; | ||
125 | interrupts = <16 2 1 11>; | ||
126 | #address-cells = <2>; | ||
127 | #size-cells = <2>; | ||
128 | ranges; | ||
129 | |||
130 | port1 { | ||
131 | #address-cells = <2>; | ||
132 | #size-cells = <2>; | ||
133 | cell-index = <1>; | ||
134 | }; | ||
135 | |||
136 | port2 { | ||
137 | #address-cells = <2>; | ||
138 | #size-cells = <2>; | ||
139 | cell-index = <2>; | ||
140 | }; | ||
141 | }; | ||
142 | |||
123 | &dcsr { | 143 | &dcsr { |
124 | #address-cells = <1>; | 144 | #address-cells = <1>; |
125 | #size-cells = <1>; | 145 | #size-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi index 9cda4814a23e..d41d08de7f7e 100644 --- a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | |||
@@ -147,6 +147,26 @@ | |||
147 | }; | 147 | }; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | &rio { | ||
151 | compatible = "fsl,srio"; | ||
152 | interrupts = <16 2 1 11>; | ||
153 | #address-cells = <2>; | ||
154 | #size-cells = <2>; | ||
155 | ranges; | ||
156 | |||
157 | port1 { | ||
158 | #address-cells = <2>; | ||
159 | #size-cells = <2>; | ||
160 | cell-index = <1>; | ||
161 | }; | ||
162 | |||
163 | port2 { | ||
164 | #address-cells = <2>; | ||
165 | #size-cells = <2>; | ||
166 | cell-index = <2>; | ||
167 | }; | ||
168 | }; | ||
169 | |||
150 | &dcsr { | 170 | &dcsr { |
151 | #address-cells = <1>; | 171 | #address-cells = <1>; |
152 | #size-cells = <1>; | 172 | #size-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi index 1510991a40d3..8d35d2c1f694 100644 --- a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | |||
@@ -121,17 +121,24 @@ | |||
121 | }; | 121 | }; |
122 | 122 | ||
123 | &rio { | 123 | &rio { |
124 | compatible = "fsl,srio"; | ||
125 | interrupts = <16 2 1 11>; | ||
124 | #address-cells = <2>; | 126 | #address-cells = <2>; |
125 | #size-cells = <2>; | 127 | #size-cells = <2>; |
126 | compatible = "fsl,rapidio-delta"; | 128 | fsl,srio-rmu-handle = <&rmu>; |
127 | interrupts = < | 129 | ranges; |
128 | 16 2 1 11 /* err_irq */ | 130 | |
129 | 56 2 0 0 /* bell_outb_irq */ | 131 | port1 { |
130 | 57 2 0 0 /* bell_inb_irq */ | 132 | #address-cells = <2>; |
131 | 60 2 0 0 /* msg1_tx_irq */ | 133 | #size-cells = <2>; |
132 | 61 2 0 0 /* msg1_rx_irq */ | 134 | cell-index = <1>; |
133 | 62 2 0 0 /* msg2_tx_irq */ | 135 | }; |
134 | 63 2 0 0>; /* msg2_rx_irq */ | 136 | |
137 | port2 { | ||
138 | #address-cells = <2>; | ||
139 | #size-cells = <2>; | ||
140 | cell-index = <2>; | ||
141 | }; | ||
135 | }; | 142 | }; |
136 | 143 | ||
137 | &dcsr { | 144 | &dcsr { |
@@ -280,6 +287,7 @@ | |||
280 | 16 2 1 30>; | 287 | 16 2 1 30>; |
281 | }; | 288 | }; |
282 | 289 | ||
290 | /include/ "qoriq-rmu-0.dtsi" | ||
283 | /include/ "qoriq-mpic.dtsi" | 291 | /include/ "qoriq-mpic.dtsi" |
284 | 292 | ||
285 | guts: global-utilities@e0000 { | 293 | guts: global-utilities@e0000 { |
diff --git a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi index b353ac9da01c..b9556ee3a639 100644 --- a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | |||
@@ -69,8 +69,6 @@ | |||
69 | rtic_c = &rtic_c; | 69 | rtic_c = &rtic_c; |
70 | rtic_d = &rtic_d; | 70 | rtic_d = &rtic_d; |
71 | sec_mon = &sec_mon; | 71 | sec_mon = &sec_mon; |
72 | |||
73 | rio0 = &rapidio0; | ||
74 | }; | 72 | }; |
75 | 73 | ||
76 | cpus { | 74 | cpus { |
diff --git a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi index 7135c67bb5a6..914074b91a85 100644 --- a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | |||
@@ -147,6 +147,26 @@ | |||
147 | }; | 147 | }; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | &rio { | ||
151 | compatible = "fsl,srio"; | ||
152 | interrupts = <16 2 1 11>; | ||
153 | #address-cells = <2>; | ||
154 | #size-cells = <2>; | ||
155 | ranges; | ||
156 | |||
157 | port1 { | ||
158 | #address-cells = <2>; | ||
159 | #size-cells = <2>; | ||
160 | cell-index = <1>; | ||
161 | }; | ||
162 | |||
163 | port2 { | ||
164 | #address-cells = <2>; | ||
165 | #size-cells = <2>; | ||
166 | cell-index = <2>; | ||
167 | }; | ||
168 | }; | ||
169 | |||
150 | &dcsr { | 170 | &dcsr { |
151 | #address-cells = <1>; | 171 | #address-cells = <1>; |
152 | #size-cells = <1>; | 172 | #size-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi new file mode 100644 index 000000000000..587ca9ffad7d --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi | |||
@@ -0,0 +1,68 @@ | |||
1 | /* | ||
2 | * PQ3 RIO Message Unit device tree stub [ controller @ offset 0xd3000 ] | ||
3 | * | ||
4 | * Copyright 2011 Freescale Semiconductor Inc. | ||
5 | * | ||
6 | * Redistribution and use in source and binary forms, with or without | ||
7 | * modification, are permitted provided that the following conditions are met: | ||
8 | * * Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * * Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * * Neither the name of Freescale Semiconductor nor the | ||
14 | * names of its contributors may be used to endorse or promote products | ||
15 | * derived from this software without specific prior written permission. | ||
16 | * | ||
17 | * | ||
18 | * ALTERNATIVELY, this software may be distributed under the terms of the | ||
19 | * GNU General Public License ("GPL") as published by the Free Software | ||
20 | * Foundation, either version 2 of that License or (at your option) any | ||
21 | * later version. | ||
22 | * | ||
23 | * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY | ||
24 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
25 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
26 | * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY | ||
27 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
28 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
29 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
30 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
31 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
32 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
33 | */ | ||
34 | |||
35 | rmu: rmu@d3000 { | ||
36 | #address-cells = <1>; | ||
37 | #size-cells = <1>; | ||
38 | compatible = "fsl,srio-rmu"; | ||
39 | reg = <0xd3000 0x500>; | ||
40 | ranges = <0x0 0xd3000 0x500>; | ||
41 | |||
42 | message-unit@0 { | ||
43 | compatible = "fsl,srio-msg-unit"; | ||
44 | reg = <0x0 0x100>; | ||
45 | interrupts = < | ||
46 | 53 2 0 0 /* msg1_tx_irq */ | ||
47 | 54 2 0 0>;/* msg1_rx_irq */ | ||
48 | }; | ||
49 | message-unit@100 { | ||
50 | compatible = "fsl,srio-msg-unit"; | ||
51 | reg = <0x100 0x100>; | ||
52 | interrupts = < | ||
53 | 55 2 0 0 /* msg2_tx_irq */ | ||
54 | 56 2 0 0>;/* msg2_rx_irq */ | ||
55 | }; | ||
56 | doorbell-unit@400 { | ||
57 | compatible = "fsl,srio-dbell-unit"; | ||
58 | reg = <0x400 0x80>; | ||
59 | interrupts = < | ||
60 | 49 2 0 0 /* bell_outb_irq */ | ||
61 | 50 2 0 0>;/* bell_inb_irq */ | ||
62 | }; | ||
63 | port-write-unit@4e0 { | ||
64 | compatible = "fsl,srio-port-write-unit"; | ||
65 | reg = <0x4e0 0x20>; | ||
66 | interrupts = <48 2 0 0>; | ||
67 | }; | ||
68 | }; | ||
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 02eaad3d5a7c..09598bb5d443 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -297,7 +297,9 @@ | |||
297 | 297 | ||
298 | rio: rapidio@e00c00000 { | 298 | rio: rapidio@e00c00000 { |
299 | reg = <0x0 0xe00c0000 0x0 0x20000>; | 299 | reg = <0x0 0xe00c0000 0x0 0x20000>; |
300 | ranges = <0x0 0x0 0x0 0xc0000000 0x0 0x20000000>; | 300 | port1 { |
301 | ranges = <0x0 0x0 0x0 0xc0000000 0x0 0x20000000>; | ||
302 | }; | ||
301 | }; | 303 | }; |
302 | 304 | ||
303 | leds { | 305 | leds { |
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts index 976a7f99f7f5..7e283c891b7f 100644 --- a/arch/powerpc/boot/dts/mpc8569mds.dts +++ b/arch/powerpc/boot/dts/mpc8569mds.dts | |||
@@ -440,7 +440,12 @@ | |||
440 | 440 | ||
441 | rio: rapidio@e00c00000 { | 441 | rio: rapidio@e00c00000 { |
442 | reg = <0x0 0xe00c0000 0x0 0x20000>; | 442 | reg = <0x0 0xe00c0000 0x0 0x20000>; |
443 | ranges = <0x0 0x0 0x0 0xc0000000 0x0 0x20000000>; | 443 | port1 { |
444 | ranges = <0x0 0x0 0x0 0xc0000000 0x0 0x20000000>; | ||
445 | }; | ||
446 | port2 { | ||
447 | status = "disabled"; | ||
448 | }; | ||
444 | }; | 449 | }; |
445 | }; | 450 | }; |
446 | 451 | ||
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index 848320e4d3c4..fb8640e0c5b8 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -26,13 +26,6 @@ | |||
26 | serial1 = &serial1; | 26 | serial1 = &serial1; |
27 | pci0 = &pci0; | 27 | pci0 = &pci0; |
28 | pci1 = &pci1; | 28 | pci1 = &pci1; |
29 | /* | ||
30 | * Only one of Rapid IO or PCI can be present due to HW limitations and | ||
31 | * due to the fact that the 2 now share address space in the new memory | ||
32 | * map. The most likely case is that we have PCI, so comment out the | ||
33 | * rapidio node. Leave it here for reference. | ||
34 | */ | ||
35 | /* rapidio0 = &rapidio0; */ | ||
36 | }; | 29 | }; |
37 | 30 | ||
38 | cpus { | 31 | cpus { |
@@ -361,6 +354,41 @@ | |||
361 | device_type = "open-pic"; | 354 | device_type = "open-pic"; |
362 | }; | 355 | }; |
363 | 356 | ||
357 | rmu: rmu@d3000 { | ||
358 | #address-cells = <1>; | ||
359 | #size-cells = <1>; | ||
360 | compatible = "fsl,srio-rmu"; | ||
361 | reg = <0xd3000 0x500>; | ||
362 | ranges = <0x0 0xd3000 0x500>; | ||
363 | |||
364 | message-unit@0 { | ||
365 | compatible = "fsl,srio-msg-unit"; | ||
366 | reg = <0x0 0x100>; | ||
367 | interrupts = < | ||
368 | 53 2 /* msg1_tx_irq */ | ||
369 | 54 2>;/* msg1_rx_irq */ | ||
370 | }; | ||
371 | message-unit@100 { | ||
372 | compatible = "fsl,srio-msg-unit"; | ||
373 | reg = <0x100 0x100>; | ||
374 | interrupts = < | ||
375 | 55 2 /* msg2_tx_irq */ | ||
376 | 56 2>;/* msg2_rx_irq */ | ||
377 | }; | ||
378 | doorbell-unit@400 { | ||
379 | compatible = "fsl,srio-dbell-unit"; | ||
380 | reg = <0x400 0x80>; | ||
381 | interrupts = < | ||
382 | 49 2 /* bell_outb_irq */ | ||
383 | 50 2>;/* bell_inb_irq */ | ||
384 | }; | ||
385 | port-write-unit@4e0 { | ||
386 | compatible = "fsl,srio-port-write-unit"; | ||
387 | reg = <0x4e0 0x20>; | ||
388 | interrupts = <48 2>; | ||
389 | }; | ||
390 | }; | ||
391 | |||
364 | global-utilities@e0000 { | 392 | global-utilities@e0000 { |
365 | compatible = "fsl,mpc8641-guts"; | 393 | compatible = "fsl,mpc8641-guts"; |
366 | reg = <0xe0000 0x1000>; | 394 | reg = <0xe0000 0x1000>; |
@@ -612,16 +640,27 @@ | |||
612 | }; | 640 | }; |
613 | }; | 641 | }; |
614 | /* | 642 | /* |
615 | rapidio0: rapidio@ffec0000 { | 643 | * Only one of Rapid IO or PCI can be present due to HW limitations and |
644 | * due to the fact that the 2 now share address space in the new memory | ||
645 | * map. The most likely case is that we have PCI, so comment out the | ||
646 | * rapidio node. Leave it here for reference. | ||
647 | |||
648 | rapidio@ffec0000 { | ||
649 | reg = <0xffec0000 0x11000>; | ||
650 | compatible = "fsl,srio"; | ||
651 | interrupt-parent = <&mpic>; | ||
652 | interrupts = <48 2>; | ||
616 | #address-cells = <2>; | 653 | #address-cells = <2>; |
617 | #size-cells = <2>; | 654 | #size-cells = <2>; |
618 | compatible = "fsl,rapidio-delta"; | 655 | fsl,srio-rmu-handle = <&rmu>; |
619 | reg = <0xffec0000 0x20000>; | 656 | ranges; |
620 | ranges = <0 0 0x80000000 0 0x20000000>; | 657 | |
621 | interrupt-parent = <&mpic>; | 658 | port1 { |
622 | // err_irq bell_outb_irq bell_inb_irq | 659 | #address-cells = <2>; |
623 | // msg1_tx_irq msg1_rx_irq msg2_tx_irq msg2_rx_irq | 660 | #size-cells = <2>; |
624 | interrupts = <48 2 49 2 50 2 53 2 54 2 55 2 56 2>; | 661 | cell-index = <1>; |
662 | ranges = <0 0 0x80000000 0 0x20000000>; | ||
663 | }; | ||
625 | }; | 664 | }; |
626 | */ | 665 | */ |
627 | 666 | ||
diff --git a/arch/powerpc/boot/dts/p2041rdb.dts b/arch/powerpc/boot/dts/p2041rdb.dts index d6ea24d1537b..4f957db01230 100644 --- a/arch/powerpc/boot/dts/p2041rdb.dts +++ b/arch/powerpc/boot/dts/p2041rdb.dts | |||
@@ -108,6 +108,17 @@ | |||
108 | }; | 108 | }; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | rio: rapidio@ffe0c0000 { | ||
112 | reg = <0xf 0xfe0c0000 0 0x11000>; | ||
113 | |||
114 | port1 { | ||
115 | ranges = <0 0 0xc 0x20000000 0 0x10000000>; | ||
116 | }; | ||
117 | port2 { | ||
118 | ranges = <0 0 0xc 0x30000000 0 0x10000000>; | ||
119 | }; | ||
120 | }; | ||
121 | |||
111 | lbc: localbus@ffe124000 { | 122 | lbc: localbus@ffe124000 { |
112 | reg = <0xf 0xfe124000 0 0x1000>; | 123 | reg = <0xf 0xfe124000 0 0x1000>; |
113 | ranges = <0 0 0xf 0xe8000000 0x08000000>; | 124 | ranges = <0 0 0xf 0xe8000000 0x08000000>; |
diff --git a/arch/powerpc/boot/dts/p3041ds.dts b/arch/powerpc/boot/dts/p3041ds.dts index 1053d691cf1d..f469145abaeb 100644 --- a/arch/powerpc/boot/dts/p3041ds.dts +++ b/arch/powerpc/boot/dts/p3041ds.dts | |||
@@ -101,6 +101,17 @@ | |||
101 | }; | 101 | }; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | rio: rapidio@ffe0c0000 { | ||
105 | reg = <0xf 0xfe0c0000 0 0x11000>; | ||
106 | |||
107 | port1 { | ||
108 | ranges = <0 0 0xc 0x20000000 0 0x10000000>; | ||
109 | }; | ||
110 | port2 { | ||
111 | ranges = <0 0 0xc 0x30000000 0 0x10000000>; | ||
112 | }; | ||
113 | }; | ||
114 | |||
104 | lbc: localbus@ffe124000 { | 115 | lbc: localbus@ffe124000 { |
105 | reg = <0xf 0xfe124000 0 0x1000>; | 116 | reg = <0xf 0xfe124000 0 0x1000>; |
106 | ranges = <0 0 0xf 0xe8000000 0x08000000 | 117 | ranges = <0 0 0xf 0xe8000000 0x08000000 |
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts index 8ea1ae908156..6d60e54e50a0 100644 --- a/arch/powerpc/boot/dts/p4080ds.dts +++ b/arch/powerpc/boot/dts/p4080ds.dts | |||
@@ -108,9 +108,15 @@ | |||
108 | }; | 108 | }; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | rio: rapidio0: rapidio@ffe0c0000 { | 111 | rio: rapidio@ffe0c0000 { |
112 | reg = <0xf 0xfe0c0000 0 0x20000>; | 112 | reg = <0xf 0xfe0c0000 0 0x11000>; |
113 | ranges = <0 0 0xc 0x20000000 0 0x01000000>; | 113 | |
114 | port1 { | ||
115 | ranges = <0 0 0xc 0x20000000 0 0x10000000>; | ||
116 | }; | ||
117 | port2 { | ||
118 | ranges = <0 0 0xc 0x30000000 0 0x10000000>; | ||
119 | }; | ||
114 | }; | 120 | }; |
115 | 121 | ||
116 | lbc: localbus@ffe124000 { | 122 | lbc: localbus@ffe124000 { |
diff --git a/arch/powerpc/boot/dts/p5020ds.dts b/arch/powerpc/boot/dts/p5020ds.dts index ceee4f50ba42..1c250684c902 100644 --- a/arch/powerpc/boot/dts/p5020ds.dts +++ b/arch/powerpc/boot/dts/p5020ds.dts | |||
@@ -101,6 +101,17 @@ | |||
101 | }; | 101 | }; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | rio: rapidio@ffe0c0000 { | ||
105 | reg = <0xf 0xfe0c0000 0 0x11000>; | ||
106 | |||
107 | port1 { | ||
108 | ranges = <0 0 0xc 0x20000000 0 0x10000000>; | ||
109 | }; | ||
110 | port2 { | ||
111 | ranges = <0 0 0xc 0x30000000 0 0x10000000>; | ||
112 | }; | ||
113 | }; | ||
114 | |||
104 | lbc: localbus@ffe124000 { | 115 | lbc: localbus@ffe124000 { |
105 | reg = <0xf 0xfe124000 0 0x1000>; | 116 | reg = <0xf 0xfe124000 0 0x1000>; |
106 | ranges = <0 0 0xf 0xe8000000 0x08000000 | 117 | ranges = <0 0 0xf 0xe8000000 0x08000000 |