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/canyonlands.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/canyonlands.dts')
-rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index a303703..5b27a4b 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts @@ -105,6 +105,15 @@ dcr-reg = <0x00c 0x002>; }; + CPM0: cpm { + compatible = "ibm,cpm"; + dcr-access-method = "native"; + dcr-reg = <0x160 0x003>; + unused-units = <0x00000100>; + idle-doze = <0x02000000>; + standby = <0xfeff791d>; + }; + L2C0: l2c { compatible = "ibm,l2-cache-460ex", "ibm,l2-cache"; dcr-reg = <0x020 0x008 /* Internal SRAM DCR's */ @@ -270,28 +279,6 @@ interrupts = <0x1 0x4>; }; - UART2: serial@ef600500 { - device_type = "serial"; - compatible = "ns16550"; - reg = <0xef600500 0x00000008>; - virtual-reg = <0xef600500>; - clock-frequency = <0>; /* Filled in by U-Boot */ - current-speed = <0>; /* Filled in by U-Boot */ - interrupt-parent = <&UIC1>; - interrupts = <28 0x4>; - }; - - UART3: serial@ef600600 { - device_type = "serial"; - compatible = "ns16550"; - reg = <0xef600600 0x00000008>; - virtual-reg = <0xef600600>; - clock-frequency = <0>; /* Filled in by U-Boot */ - current-speed = <0>; /* Filled in by U-Boot */ - interrupt-parent = <&UIC1>; - interrupts = <29 0x4>; - }; - IIC0: i2c@ef600700 { compatible = "ibm,iic-460ex", "ibm,iic"; reg = <0xef600700 0x00000014>; |