powerpc/tqm85xx: update PCI interrupt-map attribute

Update PCI IRQ mapping on TQM85xx platforms: include INTC and INTD on PCI-X
slot and add INTA/INTB mapping for PCMCIA bridge.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index 7134753..15ca731 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -289,7 +289,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;

diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index b30f637..f49d091 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -311,7 +311,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;

diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 61f25e1..5dbb36e 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -442,7 +442,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;

diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
index 025759c..a050ae4 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -442,7 +442,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;

diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index 95e2873..81bad8c 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -311,7 +311,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;

diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index ff70580..22ec39b 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -382,7 +382,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;