diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 20:25:13 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 20:25:13 +0400 |
| commit | 42dd8d53ced84ed6b6378d632a5fcab49d91dfde (patch) | |
| tree | 2c7c6b9bcd4c9dddfa24c6025c76769b301ec2a5 /arch/arm/boot/dts/dove.dtsi | |
| parent | 4a20502de11c3837ec35f2aa7f3c53320fd58d34 (diff) | |
| parent | 6901d947be5ba1245a0f63271355b95f9056a362 (diff) | |
| download | linux-42dd8d53ced84ed6b6378d632a5fcab49d91dfde.tar.xz | |
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre <nicolas.ferre@atmel.com>:
DT modifications for at91rm9200 and at91sam9x5 SoCs, mainly around
I2C. Also some cleanup of some unneeded properties and conflicting
nodes.
One more DT-only board based on at91rm9200.
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91/at91sam9x5cm: add 1-wire chip on CM board
ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd
ARM: at91/dt: gpio-keys: remove address-cells and size-cells properties
ARM: at91: add MPA 1600 DT board
ARM: at91: add pinctrl nodes to i2c-gpio on RM92000 DT
ARM: at91: add TWI bindings to RM9200 DT
ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrl
ARM: at91: dt: at91sam9x5: add i2c pinctrl
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/dove.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 0056214935f4..6cab46849cdb 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -202,6 +202,11 @@ status = "disabled"; }; + rtc@d8500 { + compatible = "marvell,orion-rtc"; + reg = <0xd8500 0x20>; + }; + crypto: crypto@30000 { compatible = "marvell,orion-crypto"; reg = <0x30000 0x10000>, |