Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index 36c1c13..d641a89 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -47,6 +47,72 @@
                reg = <0x00000000 0x20000000>;  // 512MB at 0
        };
 
+       localbus@e0005000 {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               compatible = "fsl,mpc8379-elbc", "fsl,elbc", "simple-bus";
+               reg = <0xe0005000 0x1000>;
+               interrupts = <77 0x8>;
+               interrupt-parent = <&ipic>;
+
+               // booting from NOR flash
+               ranges = <0 0x0 0xfe000000 0x02000000
+                         1 0x0 0xf8000000 0x00008000
+                         3 0x0 0xe0600000 0x00008000>;
+
+               flash@0,0 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "cfi-flash";
+                       reg = <0 0x0 0x2000000>;
+                       bank-width = <2>;
+                       device-width = <1>;
+
+                       u-boot@0 {
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       fs@100000 {
+                               reg = <0x100000 0x800000>;
+                       };
+
+                       kernel@1d00000 {
+                               reg = <0x1d00000 0x200000>;
+                       };
+
+                       dtb@1f00000 {
+                               reg = <0x1f00000 0x100000>;
+                       };
+               };
+
+               bcsr@1,0 {
+                       reg = <1 0x0 0x8000>;
+                       compatible = "fsl,mpc837xmds-bcsr";
+               };
+
+               nand@3,0 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "fsl,mpc8379-fcm-nand",
+                                    "fsl,elbc-fcm-nand";
+                       reg = <3 0x0 0x8000>;
+
+                       u-boot@0 {
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       kernel@100000 {
+                               reg = <0x100000 0x300000>;
+                       };
+
+                       fs@400000 {
+                               reg = <0x400000 0x1c00000>;
+                       };
+               };
+       };
+
        soc@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -91,6 +157,41 @@
                        mode = "cpu";
                };
 
+               dma@82a8 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "fsl,mpc8379-dma", "fsl,elo-dma";
+                       reg = <0x82a8 4>;
+                       ranges = <0 0x8100 0x1a8>;
+                       interrupt-parent = <&ipic>;
+                       interrupts = <71 8>;
+                       cell-index = <0>;
+                       dma-channel@0 {
+                               compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0 0x80>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+                       dma-channel@80 {
+                               compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0x80 0x80>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+                       dma-channel@100 {
+                               compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0x100 0x80>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+                       dma-channel@180 {
+                               compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0x180 0x28>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+               };
+
                usb@23000 {
                        compatible = "fsl-usb2-dr";
                        reg = <0x23000 0x1000>;
@@ -168,16 +269,15 @@
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sdhc@2e000 {
@@ -189,28 +289,28 @@
                };
 
                sata@18000 {
-                       compatible = "fsl,mpc8379-sata";
+                       compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
                        reg = <0x18000 0x1000>;
                        interrupts = <44 0x8>;
                        interrupt-parent = <&ipic>;
                };
 
                sata@19000 {
-                       compatible = "fsl,mpc8379-sata";
+                       compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
                        reg = <0x19000 0x1000>;
                        interrupts = <45 0x8>;
                        interrupt-parent = <&ipic>;
                };
 
                sata@1a000 {
-                       compatible = "fsl,mpc8379-sata";
+                       compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
                        reg = <0x1a000 0x1000>;
                        interrupts = <46 0x8>;
                        interrupt-parent = <&ipic>;
                };
 
                sata@1b000 {
-                       compatible = "fsl,mpc8379-sata";
+                       compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
                        reg = <0x1b000 0x1000>;
                        interrupts = <47 0x8>;
                        interrupt-parent = <&ipic>;