diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/powerpc/boot/dts/canyonlands.dts | |
parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/powerpc/boot/dts/canyonlands.dts')
-rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index 22dd6ae84da..3dc75deafbb 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
@@ -143,6 +143,11 @@ | |||
143 | interrupts = <0x1d 0x4>; | 143 | interrupts = <0x1d 0x4>; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | HWRNG: hwrng@110000 { | ||
147 | compatible = "amcc,ppc460ex-rng", "ppc4xx-rng"; | ||
148 | reg = <4 0x00110000 0x50>; | ||
149 | }; | ||
150 | |||
146 | MAL0: mcmal { | 151 | MAL0: mcmal { |
147 | compatible = "ibm,mcmal-460ex", "ibm,mcmal2"; | 152 | compatible = "ibm,mcmal-460ex", "ibm,mcmal2"; |
148 | dcr-reg = <0x180 0x062>; | 153 | dcr-reg = <0x180 0x062>; |