summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/omap3-beagle-xm.dts
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-16 23:09:34 +0200
committerDavid S. Miller <davem@davemloft.net>2014-07-16 23:09:34 +0200
commit1a98c69af1ecd97bfd1f4e4539924a9192434e36 (patch)
treea243defcf921ea174f8e43fce11d06830a6a9c36 /arch/arm/boot/dts/omap3-beagle-xm.dts
parentMerge branch 'bonding-next' (diff)
parentMerge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd (diff)
downloadlinux-1a98c69af1ecd97bfd1f4e4539924a9192434e36.tar.xz
linux-1a98c69af1ecd97bfd1f4e4539924a9192434e36.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle-xm.dts')
-rw-r--r--arch/arm/boot/dts/omap3-beagle-xm.dts6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index cf0be662297e..1becefce821b 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -251,6 +251,11 @@
codec {
};
};
+
+ twl_power: power {
+ compatible = "ti,twl4030-power-beagleboard-xm", "ti,twl4030-power-idle-osc-off";
+ ti,use_poweroff;
+ };
};
};
@@ -301,6 +306,7 @@
};
&uart3 {
+ interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
};