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

[sfrench/cifs-2.6.git] / arch / powerpc / boot / dts / tqm8560.dts

diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index b6c2d71defd3d4eb8d394d8d6900b04268d1cb56..22ec39b5beeb8428ca65a1a71edfbe4dca0a2cb8 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -55,10 +55,22 @@
                #size-cells = <1>;
                device_type = "soc";
                ranges = <0x0 0xe0000000 0x100000>;
-               reg = <0xe0000000 0x200>;
                bus-frequency = <0>;
                compatible = "fsl,mpc8560-immr", "simple-bus";
 
+               ecm-law@0 {
+                       compatible = "fsl,ecm-law";
+                       reg = <0x0 0x1000>;
+                       fsl,num-laws = <8>;
+               };
+
+               ecm@1000 {
+                       compatible = "fsl,mpc8560-ecm", "fsl,ecm";
+                       reg = <0x1000 0x1000>;
+                       interrupts = <17 2>;
+                       interrupt-parent = <&mpic>;
+               };
+
                memory-controller@2000 {
                        compatible = "fsl,mpc8540-memory-controller";
                        reg = <0x2000 0x1000>;
@@ -359,7 +371,6 @@
        };
 
        pci0: pci@e0008000 {
-               cell-index = <0>;
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
@@ -371,7 +382,14 @@
                interrupt-map = <
                                /* IDSEL 28 */
                                 0xe000 0 0 1 &mpic 2 1
-                                0xe000 0 0 2 &mpic 3 1>;
+                                0xe000 0 0 2 &mpic 3 1
+                                0xe000 0 0 3 &mpic 6 1
+                                0xe000 0 0 4 &mpic 5 1
+
+                               /* IDSEL 11 */
+                                0x5800 0 0 1 &mpic 6 1
+                                0x5800 0 0 2 &mpic 5 1
+                                >;
 
                interrupt-parent = <&mpic>;
                interrupts = <24 2>;