Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / boot / dts / kilauea.dts

diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 083e68eeaca4c5d4e3a7fdf3f11268ec62a6cbc1..89edb16649c36609aa2481e97fdf97786ea9872e 100644 (file)
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -82,6 +82,15 @@
                interrupt-parent = <&UIC0>;
        };
 
+       CPM0: cpm {
+               compatible = "ibm,cpm";
+               dcr-access-method = "native";
+               dcr-reg = <0x0b0 0x003>;
+               unused-units = <0x00000000>;
+               idle-doze = <0x02000000>;
+               standby = <0xe3e74800>;
+       };
+
        plb {
                compatible = "ibm,plb-405ex", "ibm,plb4";
                #address-cells = <1>;