Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...

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

diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
index 7a31d46..261c34b 100644 (file)
--- a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+++ b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
@@ -15,27 +15,21 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "p2020si.dtsi"
+
 / {
-       model = "fsl,P2020";
+       model = "fsl,P2020RDB";
        compatible = "fsl,P2020RDB", "fsl,MPC85XXRDB-CAMP";
-       #address-cells = <2>;
-       #size-cells = <2>;
 
        aliases {
                ethernet0 = &enet0;
-               serial0 = &serial0;
+               serial0 = &serial1;
                pci1 = &pci1;
        };
 
        cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               PowerPC,P2020@1 {
-                       device_type = "cpu";
-                       reg = <0x1>;
-                       next-level-cache = <&L2>;
+               PowerPC,P2020@0 {
+               status = "disabled";
                };
        };
 
@@ -43,20 +37,37 @@
                device_type = "memory";
        };
 
+       localbus@ffe05000 {
+               status = "disabled";
+       };
+
        soc@ffe00000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               device_type = "soc";
-               compatible = "fsl,p2020-immr", "simple-bus";
-               ranges = <0x0  0x0 0xffe00000 0x100000>;
-               bus-frequency = <0>;            // Filled out by uboot.
-
-               serial0: serial@4600 {
-                       cell-index = <1>;
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0x4600 0x100>;
-                       clock-frequency = <0>;
+               ecm-law@0 {
+                       status = "disabled";
+               };
+
+               ecm@1000 {
+                       status = "disabled";
+               };
+
+               memory-controller@2000 {
+                       status = "disabled";
+               };
+
+               i2c@3000 {
+                       status = "disabled";
+               };
+
+               i2c@3100 {
+                       status = "disabled";
+               };
+
+               serial0: serial@4500 {
+                       status = "disabled";
+               };
+
+               spi@7000 {
+                       status = "disabled";
                };
 
                dma@c300 {
@@ -96,6 +107,10 @@
                        };
                };
 
+               gpio: gpio-controller@f000 {
+                       status = "disabled";
+               };
+
                L2: l2-cache-controller@20000 {
                        compatible = "fsl,p2020-l2-cache-controller";
                        reg = <0x20000 0x1000>;
@@ -104,31 +119,49 @@
                        interrupt-parent = <&mpic>;
                };
 
+               dma@21300 {
+                       status = "disabled";
+               };
+
+               usb@22000 {
+                       status = "disabled";
+               };
+
+               mdio@24520 {
+                       status = "disabled";
+               };
+
+               mdio@25520 {
+                       status = "disabled";
+               };
+
+               mdio@26520 {
+                       status = "disabled";
+               };
 
                enet0: ethernet@24000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       cell-index = <0>;
-                       device_type = "network";
-                       model = "eTSEC";
-                       compatible = "gianfar";
-                       reg = <0x24000 0x1000>;
-                       ranges = <0x0 0x24000 0x1000>;
-                       local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <29 2 30 2 34 2>;
-                       interrupt-parent = <&mpic>;
                        fixed-link = <1 1 1000 0 0>;
                        phy-connection-type = "rgmii-id";
 
                };
 
+               enet1: ethernet@25000 {
+                       status = "disabled";
+               };
+
+               enet2: ethernet@26000 {
+                       status = "disabled";
+               };
+
+               sdhci@2e000 {
+                       status = "disabled";
+               };
+
+               crypto@30000 {
+                       status = "disabled";
+               };
+
                mpic: pic@40000 {
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <0x40000 0x40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
                        protected-sources = <
                        17 18 43 42 59 47 /*ecm, mem, i2c, serial0, spi,gpio */
                        16 20 21 22 23 28       /* L2, dma1, USB */
@@ -152,21 +185,32 @@
                                0xe7 0>;
                        interrupt-parent = <&mpic>;
                };
+
+               global-utilities@e0000 {        //global utilities block
+                       status = "disabled";
+               };
+
        };
 
-       pci1: pcie@ffe0a000 {
-               compatible = "fsl,mpc8548-pcie";
-               device_type = "pci";
-               #interrupt-cells = <1>;
-               #size-cells = <2>;
-               #address-cells = <3>;
-               reg = <0 0xffe0a000 0 0x1000>;
-               bus-range = <0 255>;
+       pci0: pcie@ffe08000 {
+               status = "disabled";
+       };
+
+       pci1: pcie@ffe09000 {
+               status = "disabled";
+       };
+
+       pci2: pcie@ffe0a000 {
                ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
                          0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-               clock-frequency = <33333333>;
-               interrupt-parent = <&mpic>;
-               interrupts = <26 2>;
+               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+               interrupt-map = <
+                       /* IDSEL 0x0 */
+                       0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                       0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                       0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                       0000 0x0 0x0 0x4 &mpic 0x3 0x1
+                       >;
                pcie@0 {
                        reg = <0x0 0x0 0x0 0x0 0x0>;
                        #size-cells = <2>;