diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/powerpc/boot/dts/canyonlands.dts | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/powerpc/boot/dts/canyonlands.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index 8b5ba8261a36..4447def69dc5 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
| @@ -127,6 +127,13 @@ | |||
| 127 | dcr-reg = <0x010 0x002>; | 127 | dcr-reg = <0x010 0x002>; |
| 128 | }; | 128 | }; |
| 129 | 129 | ||
| 130 | CRYPTO: crypto@180000 { | ||
| 131 | compatible = "amcc,ppc460ex-crypto", "amcc,ppc4xx-crypto"; | ||
| 132 | reg = <4 0x00180000 0x80400>; | ||
| 133 | interrupt-parent = <&UIC0>; | ||
| 134 | interrupts = <0x1d 0x4>; | ||
| 135 | }; | ||
| 136 | |||
| 130 | MAL0: mcmal { | 137 | MAL0: mcmal { |
| 131 | compatible = "ibm,mcmal-460ex", "ibm,mcmal2"; | 138 | compatible = "ibm,mcmal-460ex", "ibm,mcmal2"; |
| 132 | dcr-reg = <0x180 0x062>; | 139 | dcr-reg = <0x180 0x062>; |