tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: dts: gemini: Consolidate PCI interrupt-map properties
The Gemini PCI 'interrupt-map' does not vary by board, so let's move
the definition to a common location. This avoids having incomplete
interrupt properties (i.e. #interrupt-cells without interrupt-map).
Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
authored by
Rob Herring
and committed by
Linus Walleij
07a6602b
0f275238
+20
-91
-18
arch/arm/boot/dts/gemini-dlink-dir-685.dts
-18
arch/arm/boot/dts/gemini-dlink-dir-685.dts
···
439
439
440
440
pci@50000000 {
441
441
status = "okay";
442
-
interrupt-map-mask = <0xf800 0 0 7>;
443
-
interrupt-map =
444
-
<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
445
-
<0x4800 0 0 2 &pci_intc 1>,
446
-
<0x4800 0 0 3 &pci_intc 2>,
447
-
<0x4800 0 0 4 &pci_intc 3>,
448
-
<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
449
-
<0x5000 0 0 2 &pci_intc 2>,
450
-
<0x5000 0 0 3 &pci_intc 3>,
451
-
<0x5000 0 0 4 &pci_intc 0>,
452
-
<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
453
-
<0x5800 0 0 2 &pci_intc 3>,
454
-
<0x5800 0 0 3 &pci_intc 0>,
455
-
<0x5800 0 0 4 &pci_intc 1>,
456
-
<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
457
-
<0x6000 0 0 2 &pci_intc 0>,
458
-
<0x6000 0 0 3 &pci_intc 1>,
459
-
<0x6000 0 0 4 &pci_intc 2>;
460
442
};
461
443
462
444
ethernet@60000000 {
-18
arch/arm/boot/dts/gemini-sl93512r.dts
-18
arch/arm/boot/dts/gemini-sl93512r.dts
···
256
256
257
257
pci@50000000 {
258
258
status = "okay";
259
-
interrupt-map-mask = <0xf800 0 0 7>;
260
-
interrupt-map =
261
-
<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
262
-
<0x4800 0 0 2 &pci_intc 1>,
263
-
<0x4800 0 0 3 &pci_intc 2>,
264
-
<0x4800 0 0 4 &pci_intc 3>,
265
-
<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
266
-
<0x5000 0 0 2 &pci_intc 2>,
267
-
<0x5000 0 0 3 &pci_intc 3>,
268
-
<0x5000 0 0 4 &pci_intc 0>,
269
-
<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
270
-
<0x5800 0 0 2 &pci_intc 3>,
271
-
<0x5800 0 0 3 &pci_intc 0>,
272
-
<0x5800 0 0 4 &pci_intc 1>,
273
-
<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
274
-
<0x6000 0 0 2 &pci_intc 0>,
275
-
<0x6000 0 0 3 &pci_intc 1>,
276
-
<0x6000 0 0 4 &pci_intc 2>;
277
259
};
278
260
279
261
ethernet@60000000 {
-18
arch/arm/boot/dts/gemini-sq201.dts
-18
arch/arm/boot/dts/gemini-sq201.dts
···
252
252
253
253
pci@50000000 {
254
254
status = "okay";
255
-
interrupt-map-mask = <0xf800 0 0 7>;
256
-
interrupt-map =
257
-
<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
258
-
<0x4800 0 0 2 &pci_intc 1>,
259
-
<0x4800 0 0 3 &pci_intc 2>,
260
-
<0x4800 0 0 4 &pci_intc 3>,
261
-
<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
262
-
<0x5000 0 0 2 &pci_intc 2>,
263
-
<0x5000 0 0 3 &pci_intc 3>,
264
-
<0x5000 0 0 4 &pci_intc 0>,
265
-
<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
266
-
<0x5800 0 0 2 &pci_intc 3>,
267
-
<0x5800 0 0 3 &pci_intc 0>,
268
-
<0x5800 0 0 4 &pci_intc 1>,
269
-
<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
270
-
<0x6000 0 0 2 &pci_intc 0>,
271
-
<0x6000 0 0 3 &pci_intc 1>,
272
-
<0x6000 0 0 4 &pci_intc 2>;
273
255
};
274
256
275
257
ethernet@60000000 {
-18
arch/arm/boot/dts/gemini-wbd111.dts
-18
arch/arm/boot/dts/gemini-wbd111.dts
···
140
140
141
141
pci@50000000 {
142
142
status = "okay";
143
-
interrupt-map-mask = <0xf800 0 0 7>;
144
-
interrupt-map =
145
-
<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
146
-
<0x4800 0 0 2 &pci_intc 1>,
147
-
<0x4800 0 0 3 &pci_intc 2>,
148
-
<0x4800 0 0 4 &pci_intc 3>,
149
-
<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
150
-
<0x5000 0 0 2 &pci_intc 2>,
151
-
<0x5000 0 0 3 &pci_intc 3>,
152
-
<0x5000 0 0 4 &pci_intc 0>,
153
-
<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
154
-
<0x5800 0 0 2 &pci_intc 3>,
155
-
<0x5800 0 0 3 &pci_intc 0>,
156
-
<0x5800 0 0 4 &pci_intc 1>,
157
-
<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
158
-
<0x6000 0 0 2 &pci_intc 0>,
159
-
<0x6000 0 0 3 &pci_intc 1>,
160
-
<0x6000 0 0 4 &pci_intc 2>;
161
143
};
162
144
163
145
ethernet@60000000 {
-18
arch/arm/boot/dts/gemini-wbd222.dts
-18
arch/arm/boot/dts/gemini-wbd222.dts
···
151
151
152
152
pci@50000000 {
153
153
status = "okay";
154
-
interrupt-map-mask = <0xf800 0 0 7>;
155
-
interrupt-map =
156
-
<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
157
-
<0x4800 0 0 2 &pci_intc 1>,
158
-
<0x4800 0 0 3 &pci_intc 2>,
159
-
<0x4800 0 0 4 &pci_intc 3>,
160
-
<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
161
-
<0x5000 0 0 2 &pci_intc 2>,
162
-
<0x5000 0 0 3 &pci_intc 3>,
163
-
<0x5000 0 0 4 &pci_intc 0>,
164
-
<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
165
-
<0x5800 0 0 2 &pci_intc 3>,
166
-
<0x5800 0 0 3 &pci_intc 0>,
167
-
<0x5800 0 0 4 &pci_intc 1>,
168
-
<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
169
-
<0x6000 0 0 2 &pci_intc 0>,
170
-
<0x6000 0 0 3 &pci_intc 1>,
171
-
<0x6000 0 0 4 &pci_intc 2>;
172
154
};
173
155
174
156
ethernet@60000000 {
+20
-1
arch/arm/boot/dts/gemini.dtsi
+20
-1
arch/arm/boot/dts/gemini.dtsi
···
289
289
device_type = "pci";
290
290
#address-cells = <3>;
291
291
#size-cells = <2>;
292
-
#interrupt-cells = <1>;
293
292
status = "disabled";
293
+
294
+
#interrupt-cells = <1>;
295
+
interrupt-map-mask = <0xf800 0 0 7>;
296
+
interrupt-map =
297
+
<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */
298
+
<0x4800 0 0 2 &pci_intc 1>,
299
+
<0x4800 0 0 3 &pci_intc 2>,
300
+
<0x4800 0 0 4 &pci_intc 3>,
301
+
<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */
302
+
<0x5000 0 0 2 &pci_intc 2>,
303
+
<0x5000 0 0 3 &pci_intc 3>,
304
+
<0x5000 0 0 4 &pci_intc 0>,
305
+
<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */
306
+
<0x5800 0 0 2 &pci_intc 3>,
307
+
<0x5800 0 0 3 &pci_intc 0>,
308
+
<0x5800 0 0 4 &pci_intc 1>,
309
+
<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */
310
+
<0x6000 0 0 2 &pci_intc 0>,
311
+
<0x6000 0 0 3 &pci_intc 1>,
312
+
<0x6000 0 0 4 &pci_intc 2>;
294
313
295
314
bus-range = <0x00 0xff>;
296
315
/* PCI ranges mappings */