[POWERPC] Fix incorrect interrupt map on FSL reference boards

The ULI based boards had the interrupt maps for USB on the ULI incorrectly
set.

Also, the MPC8572DS was missing the interrupt-map-mask for the 3rd PCIe
controller.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 54b3bdf..688af9d 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -304,9 +304,9 @@
                interrupt-map = <
                        // IDSEL 0x1c  USB
                        e000 0 0 1 &i8259 c 2
-                       e100 0 0 1 &i8259 9 2
-                       e200 0 0 1 &i8259 a 2
-                       e300 0 0 1 &i8259 b 2
+                       e100 0 0 2 &i8259 9 2
+                       e200 0 0 3 &i8259 a 2
+                       e300 0 0 4 &i8259 b 2
 
                        // IDSEL 0x1d  Audio
                        e800 0 0 1 &i8259 6 2

diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 233e0d5..813c259 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -334,9 +334,9 @@
 
                        // IDSEL 0x1c  USB
                        e000 0 0 1 &i8259 c 2
-                       e100 0 0 1 &i8259 9 2
-                       e200 0 0 1 &i8259 a 2
-                       e300 0 0 1 &i8259 b 2
+                       e100 0 0 2 &i8259 9 2
+                       e200 0 0 3 &i8259 a 2
+                       e300 0 0 4 &i8259 b 2
 
                        // IDSEL 0x1d  Audio
                        e800 0 0 1 &i8259 6 2
@@ -481,6 +481,7 @@
                clock-frequency = <1fca055>;
                interrupt-parent = <&mpic>;
                interrupts = <1b 2>;
+               interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                        /* IDSEL 0x0 */
                        0000 0 0 1 &mpic 0 1

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 86fc228..a719179 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -326,9 +326,9 @@
 
                        // IDSEL 0x1c  USB
                        e000 0 0 1 &i8259 c 2
-                       e100 0 0 1 &i8259 9 2
-                       e200 0 0 1 &i8259 a 2
-                       e300 0 0 1 &i8259 b 2
+                       e100 0 0 2 &i8259 9 2
+                       e200 0 0 3 &i8259 a 2
+                       e300 0 0 4 &i8259 b 2
 
                        // IDSEL 0x1d  Audio
                        e800 0 0 1 &i8259 6 2