diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /arch/powerpc/boot/dts/canyonlands.dts | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.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 540ec3241f72..5fd1ad09bdf2 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>; |