aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/omap4-duovero-parlor.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-12-22 13:24:29 -0800
committerOlof Johansson <olof@lixom.net>2015-12-22 13:24:29 -0800
commit741db4a72a06b18069667bd2683485e52a40df74 (patch)
treece342ded3c910663881586e9ff0ed41bdac3c341 /arch/arm/boot/dts/omap4-duovero-parlor.dts
parent8b9c13347a21aad4a35ac8b4214f55bc1e43ba16 (diff)
parent0b4d6972d7b052b23d33ff9bdbb52958664fbb26 (diff)
downloadlinux-stericsson-741db4a72a06b18069667bd2683485e52a40df74.tar.gz
Merge tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Few fixes for omaps to allow am437x only builds to boot properly with CPU_IDLE and ARM TWD timer. This is probably a common configuration setup for people making products with these SoCs so let's make sure it works. Also a wakeirq fix for duovero parlor making my life a bit easier as that allows me to run basic PM regression tests on it. It would be nice to have these in v4.4, but if it gets too late for that because of the holidays, it is not super critical if these get merged for v4.5. * tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Fix UART wakeirq for omap4 duovero parlor ARM: OMAP2+: AM43xx: select ARM TWD timer ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/omap4-duovero-parlor.dts')
-rw-r--r--arch/arm/boot/dts/omap4-duovero-parlor.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts
index 1a78f013f37a..b75f7b2b7c4a 100644
--- a/arch/arm/boot/dts/omap4-duovero-parlor.dts
+++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts
@@ -189,3 +189,7 @@
};
};
+&uart3 {
+ interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
+ &omap4_pmx_core OMAP4_UART3_RX>;
+};