diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-11 15:40:07 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-11 15:40:07 -0700 |
| commit | c49f4984fd45be36502e903e7a5a6a4faff42931 (patch) | |
| tree | f53768edb35290e7b5be2daf5deb477d905a2298 /arch/arm/boot/dts/omap4.dtsi | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
| parent | 6cf02dbb4b71f1c0c9acec89ae2df3b2318135f4 (diff) | |
| download | talos-obmc-linux-c49f4984fd45be36502e903e7a5a6a4faff42931.tar.gz talos-obmc-linux-c49f4984fd45be36502e903e7a5a6a4faff42931.zip | |
Merge tag 'for_3.13/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt
Add the minimal DTS support for DRA7xx based SoC core.
Add the initial support for N900 and gta04 phones.
Enable USB3 on OMAP5 evm board.
Add support for cryto accelerators
Add new IGEP AQUILA board
Add AM33XX EDMA support
Update HSUSB node to use the reset-gpios fmwk
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 22d9f2b593d4..6be1f5678f1a 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -56,7 +56,7 @@ cache-level = <2>; }; - local-timer@0x48240600 { + local-timer@48240600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0x48240600 0x20>; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_LEVEL_HIGH)>; @@ -663,5 +663,23 @@ ram-bits = <12>; ti,has-mailbox; }; + + aes: aes@4b501000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x4b501000 0xa0>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 111>, <&sdma 110>; + dma-names = "tx", "rx"; + }; + + des: des@480a5000 { + compatible = "ti,omap4-des"; + ti,hwmods = "des"; + reg = <0x480a5000 0xa0>; + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 117>, <&sdma 116>; + dma-names = "tx", "rx"; + }; }; }; |
