summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/omap3-beagle.dts
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-05-31 23:09:34 +0200
committerBenoit Cousson <benoit.cousson@linaro.org>2013-06-19 01:53:45 +0200
commitf96884574d2d39041a00603341d8300d29a29aad (patch)
treec2a4e7f10cef29090b36cd23613b8b213e7e93a3 /arch/arm/boot/dts/omap3-beagle.dts
parentARM: dts: OMAP3: beagle: enable user button via gpio_keys, enable wakeup (diff)
downloadlinux-f96884574d2d39041a00603341d8300d29a29aad.tar.xz
linux-f96884574d2d39041a00603341d8300d29a29aad.zip
ARM: dts: TWL4030: fix mux and wakeup for SYS_NIRQ line
On most OMAP3 platforms, the twl4030 IRQ line is connected to the SYS_NIRQ line on OMAP. Add another DTS include file (twl4030_omap3.dtsi) for boards that hook up the twl4030 this way to include. This allows RTC wake from off-mode to work again on OMAP3-based platforms with twl4030. Tested on 3530/Beagle, 3730/Beagle-xM, 3530/Overo, 3730/Overo-STORM. Special thanks to Florian Vaussard for suggesting use of preprocessor feature. Cc: Florian Vaussard <florian.vaussard@epfl.ch> Cc: Benoit Cousson <b-cousson@ti.com> Cc: Nishanth Menon <nm@ti.com> Signed-off-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle.dts')
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index eb7e02a01a0b..dfd83103657a 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -135,6 +135,7 @@
};
#include "twl4030.dtsi"
+#include "twl4030_omap3.dtsi"
&mmc1 {
vmmc-supply = <&vmmc1>;