diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
| commit | 56d8adc5695a8d3f070c8498d532389580af5611 (patch) | |
| tree | bbcb6c38506af002e94e64df8ab1540e6aba7825 /arch/powerpc/boot/dts/kilauea.dts | |
| parent | f4b98415953dcf85bac4ea0a2264a3ead4a7bcc4 (diff) | |
| parent | ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 (diff) | |
| download | op-kernel-dev-56d8adc5695a8d3f070c8498d532389580af5611.zip op-kernel-dev-56d8adc5695a8d3f070c8498d532389580af5611.tar.gz | |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/kilauea.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/kilauea.dts | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index 083e68e..89edb16 100644 --- 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>; |
