summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/dra7.dtsi
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-03-03 02:22:03 +0400
committerTony Lindgren <tony@atomide.com>2014-03-03 02:22:03 +0400
commitf777ba1780584b100ab9664cc06d04f3bb273a84 (patch)
tree865813eb0078530ca3b036c0c3eee6ce33f9315f /arch/arm/boot/dts/dra7.dtsi
parentf68e355c86cff91e5266cf937ea24fcba0641900 (diff)
parent1a5fe3ca5ea192d4309dd61f3626b79ff38693c2 (diff)
downloadlinux-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/dra7.dtsi')
-rw-r--r--arch/arm/boot/dts/dra7.dtsi7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 17f3b5adb7c2..499974a50e27 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -476,6 +476,13 @@
#hwlock-cells = <1>;
};
+ dmm@4e000000 {
+ compatible = "ti,omap5-dmm";
+ reg = <0x4e000000 0x800>;
+ interrupts = <0 113 0x4>;
+ ti,hwmods = "dmm";
+ };
+
i2c1: i2c@48070000 {
compatible = "ti,omap4-i2c";
reg = <0x48070000 0x100>;