Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc832x_mds.dts

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 015808ae102637a1a27f1c20ab5aa8ff07c49333..57c595bf10717f23036a9d292b6025c26f273afa 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -60,7 +60,7 @@
        };
 
        bcsr@f8000000 {
-               device_type = "board-control";
+               compatible = "fsl,mpc8323mds-bcsr";
                reg = <0xf8000000 0x8000>;
        };
 
@@ -423,7 +423,8 @@
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0xe0008500 0x100>;
+               reg = <0xe0008500 0x100         /* internal registers */
+                      0xe0008300 0x8>;         /* config space access registers */
                compatible = "fsl,mpc8349-pci";
                device_type = "pci";
        };