diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-03-03 02:22:03 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-03-03 02:22:03 +0400 |
| commit | f777ba1780584b100ab9664cc06d04f3bb273a84 (patch) | |
| tree | 865813eb0078530ca3b036c0c3eee6ce33f9315f /arch/arm/boot/dts/omap5.dtsi | |
| parent | f68e355c86cff91e5266cf937ea24fcba0641900 (diff) | |
| parent | 1a5fe3ca5ea192d4309dd61f3626b79ff38693c2 (diff) | |
| download | linux-f777ba1780584b100ab9664cc06d04f3bb273a84.tar.xz | |
Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt
Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'arch/arm/boot/dts/omap5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index f15c31cebc27..7fe682562dad 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -695,6 +695,13 @@ ti,hwmods = "wd_timer2"; }; + dmm@4e000000 { + compatible = "ti,omap5-dmm"; + reg = <0x4e000000 0x800>; + interrupts = <0 113 0x4>; + ti,hwmods = "dmm"; + }; + emif1: emif@4c000000 { compatible = "ti,emif-4d5"; ti,hwmods = "emif1"; |