Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc8641_hpcn.dts

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 5d82709cfcbb38fbd7ee13596f415c2dc38d6972..b0166e5c177e49d499ce4deab88a1eaa9c457a4c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -224,98 +224,36 @@
                        clock-frequency = <1fca055>;
                        interrupt-parent = <&mpic>;
                        interrupts = <18 2>;
-                       interrupt-map-mask = <f800 0 0 7>;
+                       interrupt-map-mask = <fb00 0 0 0>;
                        interrupt-map = <
                                /* IDSEL 0x11 */
-                               8800 0 0 1 &i8259 3 2
-                               8800 0 0 2 &i8259 4 2
-                               8800 0 0 3 &i8259 5 2
-                               8800 0 0 4 &i8259 6 2
+                               8800 0 0 1 &i8259 9 2
+                               8800 0 0 2 &i8259 a 2
+                               8800 0 0 3 &i8259 b 2
+                               8800 0 0 4 &i8259 c 2
 
                                /* IDSEL 0x12 */
-                               9000 0 0 1 &i8259 4 2
-                               9000 0 0 2 &i8259 5 2
-                               9000 0 0 3 &i8259 6 2
-                               9000 0 0 4 &i8259 3 2
-
-                               /* IDSEL 0x13 */
-                               9800 0 0 1 &i8259 0 0
-                               9800 0 0 2 &i8259 0 0
-                               9800 0 0 3 &i8259 0 0
-                               9800 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x14 */
-                               a000 0 0 1 &i8259 0 0
-                               a000 0 0 2 &i8259 0 0
-                               a000 0 0 3 &i8259 0 0
-                               a000 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x15 */
-                               a800 0 0 1 &i8259 0 0
-                               a800 0 0 2 &i8259 0 0
-                               a800 0 0 3 &i8259 0 0
-                               a800 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x16 */
-                               b000 0 0 1 &i8259 0 0
-                               b000 0 0 2 &i8259 0 0
-                               b000 0 0 3 &i8259 0 0
-                               b000 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x17 */
-                               b800 0 0 1 &i8259 0 0
-                               b800 0 0 2 &i8259 0 0
-                               b800 0 0 3 &i8259 0 0
-                               b800 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x18 */
-                               c000 0 0 1 &i8259 0 0
-                               c000 0 0 2 &i8259 0 0
-                               c000 0 0 3 &i8259 0 0
-                               c000 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x19 */
-                               c800 0 0 1 &i8259 0 0
-                               c800 0 0 2 &i8259 0 0
-                               c800 0 0 3 &i8259 0 0
-                               c800 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x1a */
-                               d000 0 0 1 &i8259 6 2
-                               d000 0 0 2 &i8259 3 2
-                               d000 0 0 3 &i8259 4 2
-                               d000 0 0 4 &i8259 5 2
-
-
-                               /* IDSEL 0x1b */
-                               d800 0 0 1 &i8259 5 2
-                               d800 0 0 2 &i8259 0 0
-                               d800 0 0 3 &i8259 0 0
-                               d800 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x1c */
-                               e000 0 0 1 &i8259 9 2
-                               e000 0 0 2 &i8259 a 2
-                               e000 0 0 3 &i8259 c 2
-                               e000 0 0 4 &i8259 7 2
-
-                               /* IDSEL 0x1d */
-                               e800 0 0 1 &i8259 9 2
-                               e800 0 0 2 &i8259 a 2
-                               e800 0 0 3 &i8259 b 2
-                               e800 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x1e */
-                               f000 0 0 1 &i8259 c 2
-                               f000 0 0 2 &i8259 0 0
-                               f000 0 0 3 &i8259 0 0
-                               f000 0 0 4 &i8259 0 0
-
-                               /* IDSEL 0x1f */
-                               f800 0 0 1 &i8259 6 2
-                               f800 0 0 2 &i8259 0 0
-                               f800 0 0 3 &i8259 0 0
-                               f800 0 0 4 &i8259 0 0
+                               9000 0 0 1 &i8259 a 2
+                               9000 0 0 2 &i8259 b 2
+                               9000 0 0 3 &i8259 c 2
+                               9000 0 0 4 &i8259 9 2
+
+                               // IDSEL 0x1c  USB
+                               e000 0 0 0 &i8259 c 2
+                               e100 0 0 0 &i8259 9 2
+                               e200 0 0 0 &i8259 a 2
+                               e300 0 0 0 &i8259 b 2
+
+                               // IDSEL 0x1d  Audio
+                               e800 0 0 0 &i8259 6 2
+
+                               // IDSEL 0x1e Legacy
+                               f000 0 0 0 &i8259 7 2
+                               f100 0 0 0 &i8259 7 2
+
+                               // IDSEL 0x1f IDE/SATA
+                               f800 0 0 0 &i8259 e 2
+                               f900 0 0 0 &i8259 5 2
                                >;
                        uli1575@0 {
                                reg = <0 0 0 0 0>;