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

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

diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index e781ad2..815cebb 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -14,8 +14,8 @@
 / {
        model = "fsl,mpc8536ds";
        compatible = "fsl,mpc8536ds";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       #address-cells = <2>;
+       #size-cells = <2>;
 
        aliases {
                ethernet0 = &enet0;
@@ -42,7 +42,7 @@
 
        memory {
                device_type = "memory";
-               reg = <00000000 00000000>;      // Filled by U-Boot
+               reg = <0 0 0 0>;        // Filled by U-Boot
        };
 
        soc@ffe00000 {
@@ -50,7 +50,7 @@
                #size-cells = <1>;
                device_type = "soc";
                compatible = "simple-bus";
-               ranges = <0x0 0xffe00000 0x100000>;
+               ranges = <0x0 0 0xffe00000 0x100000>;
                bus-frequency = <0>;            // Filled out by uboot.
 
                ecm-law@0 {
@@ -250,6 +250,14 @@
                        phy_type = "ulpi";
                };
 
+               sdhci@2e000 {
+                       compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";
+                       reg = <0x2e000 0x1000>;
+                       interrupts = <72 0x2>;
+                       interrupt-parent = <&mpic>;
+                       clock-frequency = <250000000>;
+               };
+
                serial0: serial@4500 {
                        cell-index = <0>;
                        device_type = "serial";
@@ -347,13 +355,13 @@
                interrupt-parent = <&mpic>;
                interrupts = <24 0x2>;
                bus-range = <0 0xff>;
-               ranges = <0x02000000 0 0x80000000 0x80000000 0 0x10000000
-                         0x01000000 0 0x00000000 0xffc00000 0 0x00010000>;
+               ranges = <0x02000000 0 0x80000000 0 0x80000000 0 0x10000000
+                         0x01000000 0 0x00000000 0 0xffc00000 0 0x00010000>;
                clock-frequency = <66666666>;
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe08000 0x1000>;
+               reg = <0 0xffe08000 0 0x1000>;
        };
 
        pci1: pcie@ffe09000 {
@@ -362,10 +370,10 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe09000 0x1000>;
+               reg = <0 0xffe09000 0 0x1000>;
                bus-range = <0 0xff>;
-               ranges = <0x02000000 0 0x98000000 0x98000000 0 0x08000000
-                         0x01000000 0 0x00000000 0xffc20000 0 0x00010000>;
+               ranges = <0x02000000 0 0x98000000 0 0x98000000 0 0x08000000
+                         0x01000000 0 0x00000000 0 0xffc20000 0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
                interrupts = <25 0x2>;
@@ -398,10 +406,10 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe0a000 0x1000>;
+               reg = <0 0xffe0a000 0 0x1000>;
                bus-range = <0 0xff>;
-               ranges = <0x02000000 0 0x90000000 0x90000000 0 0x08000000
-                         0x01000000 0 0x00000000 0xffc10000 0 0x00010000>;
+               ranges = <0x02000000 0 0x90000000 0 0x90000000 0 0x08000000
+                         0x01000000 0 0x00000000 0 0xffc10000 0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
                interrupts = <26 0x2>;
@@ -434,10 +442,10 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xffe0b000 0x1000>;
+               reg = <0 0xffe0b000 0 0x1000>;
                bus-range = <0 0xff>;
-               ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x20000000
-                         0x01000000 0 0x00000000 0xffc30000 0 0x00010000>;
+               ranges = <0x02000000 0 0xa0000000 0 0xa0000000 0 0x20000000
+                         0x01000000 0 0x00000000 0 0xffc30000 0 0x00010000>;
                clock-frequency = <33333333>;
                interrupt-parent = <&mpic>;
                interrupts = <27 0x2>;