aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts
diff options
context:
space:
mode:
authorVitaly Bordug <vbordug@ru.mvista.com>2007-01-30 18:08:54 -0500
committerPaul Mackerras <paulus@samba.org>2007-02-06 22:03:20 -0500
commit73844ecbaa58885c5e89af7d1b08faaffffa6833 (patch)
treedf2a4f20261e2cf348347786362dff0701e54359 /arch/powerpc/boot/dts
parentc19cdcb1b8d33a20d372191eced2def7f901806b (diff)
[POWERPC] cpm2: CPM2 interrupt controller fix
This contains important fixes for the CPM2 PIC code. Eliminated CPM_IRQ_OFFSET, pulling the respective interrupt numbers from the interrupt mapping. Updated devicetree files to reflect that. Changed direct IC-related IO accesses to the IO accessors. Fixed all the sense values to keep coherency with ipic. In the current code, CPM2 stuff will have no IRQs and hence could be hardly usable. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r--arch/powerpc/boot/dts/mpc8272ads.dts47
-rw-r--r--arch/powerpc/boot/dts/mpc8560ads.dts10
2 files changed, 32 insertions, 25 deletions
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 34efdd028c4f..286638e8af6e 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -53,6 +53,13 @@
53 reg = <00000000 4000000 f4500000 00000020>; 53 reg = <00000000 4000000 f4500000 00000020>;
54 }; 54 };
55 55
56 chosen {
57 name = "chosen";
58 linux,platform = <0>;
59 interrupt-controller = <10c00>;
60 linux,phandle = <400>;
61 };
62
56 soc8272@f0000000 { 63 soc8272@f0000000 {
57 #address-cells = <1>; 64 #address-cells = <1>;
58 #size-cells = <1>; 65 #size-cells = <1>;
@@ -71,7 +78,7 @@
71 ethernet-phy@0 { 78 ethernet-phy@0 {
72 linux,phandle = <2452000>; 79 linux,phandle = <2452000>;
73 interrupt-parent = <10c00>; 80 interrupt-parent = <10c00>;
74 interrupts = <19 1>; 81 interrupts = <17 4>;
75 reg = <0>; 82 reg = <0>;
76 bitbang = [ 12 12 13 02 02 01 ]; 83 bitbang = [ 12 12 13 02 02 01 ];
77 device_type = "ethernet-phy"; 84 device_type = "ethernet-phy";
@@ -79,7 +86,7 @@
79 ethernet-phy@1 { 86 ethernet-phy@1 {
80 linux,phandle = <2452001>; 87 linux,phandle = <2452001>;
81 interrupt-parent = <10c00>; 88 interrupt-parent = <10c00>;
82 interrupts = <19 1>; 89 interrupts = <17 4>;
83 bitbang = [ 12 12 13 02 02 01 ]; 90 bitbang = [ 12 12 13 02 02 01 ];
84 reg = <3>; 91 reg = <3>;
85 device_type = "ethernet-phy"; 92 device_type = "ethernet-phy";
@@ -90,7 +97,7 @@
90 #address-cells = <1>; 97 #address-cells = <1>;
91 #size-cells = <0>; 98 #size-cells = <0>;
92 device_type = "network"; 99 device_type = "network";
93 device-id = <2>; 100 device-id = <1>;
94 compatible = "fs_enet"; 101 compatible = "fs_enet";
95 model = "FCC"; 102 model = "FCC";
96 reg = <11300 20 8400 100 11380 30>; 103 reg = <11300 20 8400 100 11380 30>;
@@ -104,7 +111,7 @@
104 111
105 ethernet@25000 { 112 ethernet@25000 {
106 device_type = "network"; 113 device_type = "network";
107 device-id = <3>; 114 device-id = <2>;
108 compatible = "fs_enet"; 115 compatible = "fs_enet";
109 model = "FCC"; 116 model = "FCC";
110 reg = <11320 20 8500 100 113b0 30>; 117 reg = <11320 20 8500 100 113b0 30>;
@@ -133,7 +140,7 @@
133 device_type = "serial"; 140 device_type = "serial";
134 compatible = "cpm_uart"; 141 compatible = "cpm_uart";
135 model = "SCC"; 142 model = "SCC";
136 device-id = <2>; 143 device-id = <1>;
137 reg = <11a00 20 8000 100>; 144 reg = <11a00 20 8000 100>;
138 current-speed = <1c200>; 145 current-speed = <1c200>;
139 interrupts = <28 2>; 146 interrupts = <28 2>;
@@ -147,7 +154,7 @@
147 device_type = "serial"; 154 device_type = "serial";
148 compatible = "cpm_uart"; 155 compatible = "cpm_uart";
149 model = "SCC"; 156 model = "SCC";
150 device-id = <5>; 157 device-id = <4>;
151 reg = <11a60 20 8300 100>; 158 reg = <11a60 20 8300 100>;
152 current-speed = <1c200>; 159 current-speed = <1c200>;
153 interrupts = <2b 2>; 160 interrupts = <2b 2>;
@@ -181,24 +188,24 @@
181 interrupt-map = < 188 interrupt-map = <
182 189
183 /* IDSEL 0x16 */ 190 /* IDSEL 0x16 */
184 b000 0 0 1 f8200000 40 0 191 b000 0 0 1 f8200000 40 8
185 b000 0 0 2 f8200000 41 0 192 b000 0 0 2 f8200000 41 8
186 b000 0 0 3 f8200000 42 0 193 b000 0 0 3 f8200000 42 8
187 b000 0 0 4 f8200000 43 0 194 b000 0 0 4 f8200000 43 8
188 195
189 /* IDSEL 0x17 */ 196 /* IDSEL 0x17 */
190 b800 0 0 1 f8200000 43 0 197 b800 0 0 1 f8200000 43 8
191 b800 0 0 2 f8200000 40 0 198 b800 0 0 2 f8200000 40 8
192 b800 0 0 3 f8200000 41 0 199 b800 0 0 3 f8200000 41 8
193 b800 0 0 4 f8200000 42 0 200 b800 0 0 4 f8200000 42 8
194 201
195 /* IDSEL 0x18 */ 202 /* IDSEL 0x18 */
196 c000 0 0 1 f8200000 42 0 203 c000 0 0 1 f8200000 42 8
197 c000 0 0 2 f8200000 43 0 204 c000 0 0 2 f8200000 43 8
198 c000 0 0 3 f8200000 40 0 205 c000 0 0 3 f8200000 40 8
199 c000 0 0 4 f8200000 41 0>; 206 c000 0 0 4 f8200000 41 8>;
200 interrupt-parent = <10c00>; 207 interrupt-parent = <10c00>;
201 interrupts = <14 3>; 208 interrupts = <14 8>;
202 bus-range = <0 0>; 209 bus-range = <0 0>;
203 ranges = <02000000 0 80000000 80000000 0 40000000 210 ranges = <02000000 0 80000000 80000000 0 40000000
204 01000000 0 00000000 f6000000 0 02000000>; 211 01000000 0 00000000 f6000000 0 02000000>;
@@ -210,7 +217,7 @@
210 model = "SEC2"; 217 model = "SEC2";
211 compatible = "talitos"; 218 compatible = "talitos";
212 reg = <30000 10000>; 219 reg = <30000 10000>;
213 interrupts = <b 0>; 220 interrupts = <b 2>;
214 interrupt-parent = <10c00>; 221 interrupt-parent = <10c00>;
215 num-channels = <4>; 222 num-channels = <4>;
216 channel-fifo-len = <18>; 223 channel-fifo-len = <18>;
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 2b168486aeba..119bd5d3a834 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -200,7 +200,7 @@
200 a800 0 0 4 40000 31 1>; 200 a800 0 0 4 40000 31 1>;
201 201
202 interrupt-parent = <40000>; 202 interrupt-parent = <40000>;
203 interrupts = <42 0>; 203 interrupts = <8 0>;
204 bus-range = <0 0>; 204 bus-range = <0 0>;
205 ranges = <02000000 0 80000000 80000000 0 20000000 205 ranges = <02000000 0 80000000 80000000 0 20000000
206 01000000 0 00000000 e2000000 0 01000000>; 206 01000000 0 00000000 e2000000 0 01000000>;
@@ -250,7 +250,7 @@
250 rx-clock = <1>; 250 rx-clock = <1>;
251 tx-clock = <1>; 251 tx-clock = <1>;
252 current-speed = <1c200>; 252 current-speed = <1c200>;
253 interrupts = <64 1>; 253 interrupts = <28 8>;
254 interrupt-parent = <90c00>; 254 interrupt-parent = <90c00>;
255 }; 255 };
256 256
@@ -264,7 +264,7 @@
264 rx-clock = <2>; 264 rx-clock = <2>;
265 tx-clock = <2>; 265 tx-clock = <2>;
266 current-speed = <1c200>; 266 current-speed = <1c200>;
267 interrupts = <65 1>; 267 interrupts = <29 8>;
268 interrupt-parent = <90c00>; 268 interrupt-parent = <90c00>;
269 }; 269 };
270 270
@@ -278,7 +278,7 @@
278 clock-setup = <ff00ffff 250000>; 278 clock-setup = <ff00ffff 250000>;
279 rx-clock = <15>; 279 rx-clock = <15>;
280 tx-clock = <16>; 280 tx-clock = <16>;
281 interrupts = <5d 1>; 281 interrupts = <21 8>;
282 interrupt-parent = <90c00>; 282 interrupt-parent = <90c00>;
283 phy-handle = <2452002>; 283 phy-handle = <2452002>;
284 }; 284 };
@@ -293,7 +293,7 @@
293 clock-setup = <ffff00ff 3700>; 293 clock-setup = <ffff00ff 3700>;
294 rx-clock = <17>; 294 rx-clock = <17>;
295 tx-clock = <18>; 295 tx-clock = <18>;
296 interrupts = <5e 1>; 296 interrupts = <22 8>;
297 interrupt-parent = <90c00>; 297 interrupt-parent = <90c00>;
298 phy-handle = <2452003>; 298 phy-handle = <2452003>;
299 }; 299 };
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-30 16:28:18 -0500