Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...

[pandora-kernel.git] / arch / powerpc / boot / dts / p1022ds.dts

diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts
index 8bcb10b..69422eb 100644 (file)
--- a/arch/powerpc/boot/dts/p1022ds.dts
+++ b/arch/powerpc/boot/dts/p1022ds.dts
@@ -148,6 +148,17 @@
                                label = "reserved-nand";
                        };
                };
+
+               board-control@3,0 {
+                       compatible = "fsl,p1022ds-pixis";
+                       reg = <3 0 0x30>;
+                       interrupt-parent = <&mpic>;
+                       /*
+                        * IRQ8 is generated if the "EVENT" switch is pressed
+                        * and PX_CTL[EVESEL] is set to 00.
+                        */
+                       interrupts = <8 8>;
+               };
        };
 
        soc@fffe00000 {
@@ -280,13 +291,13 @@
                        ranges = <0x0 0xc100 0x200>;
                        cell-index = <1>;
                        dma00: dma-channel@0 {
-                               compatible = "fsl,eloplus-dma-channel";
+                               compatible = "fsl,ssi-dma-channel";
                                reg = <0x0 0x80>;
                                cell-index = <0>;
                                interrupts = <76 2>;
                        };
                        dma01: dma-channel@80 {
-                               compatible = "fsl,eloplus-dma-channel";
+                               compatible = "fsl,ssi-dma-channel";
                                reg = <0x80 0x80>;
                                cell-index = <1>;
                                interrupts = <77 2>;