diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-03-02 23:22:03 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-03-02 23:22:03 +0100 |
| commit | f777ba1780584b100ab9664cc06d04f3bb273a84 (patch) | |
| tree | 865813eb0078530ca3b036c0c3eee6ce33f9315f /arch/arm/boot/dts/omap4.dtsi | |
| parent | ARM: dts: am43xx: add support for parallel NAND flash (diff) | |
| parent | ARM: dts: omap4+: Add DMM bindings (diff) | |
| download | linux-f777ba1780584b100ab9664cc06d04f3bb273a84.tar.xz linux-f777ba1780584b100ab9664cc06d04f3bb273a84.zip | |
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/omap4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 890223780620..afa23bcf6f44 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -566,6 +566,13 @@ ti,hwmods = "kbd"; }; + dmm@4e000000 { + compatible = "ti,omap4-dmm"; + reg = <0x4e000000 0x800>; + interrupts = <0 113 0x4>; + ti,hwmods = "dmm"; + }; + emif1: emif@4c000000 { compatible = "ti,emif-4d"; reg = <0x4c000000 0x100>; |