summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/omap3-beagle-xm.dts
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-05-31 16:27:05 (GMT)
committerBenoit Cousson <benoit.cousson@linaro.org>2013-06-18 23:53:45 (GMT)
commitd641c3d5870db37709f9536054122255f007058c (patch)
treefe9db73323c0353bb227140211b027b73732a226 /arch/arm/boot/dts/omap3-beagle-xm.dts
parentb859c1ef92fca08a3079d9ff81e0e0bf7980c855 (diff)
downloadlinux-d641c3d5870db37709f9536054122255f007058c.tar.xz
ARM: dts: OMAP3: beagle: enable user button via gpio_keys, enable wakeup
Using the gpio-keys bindings, configure the user button on Beagle boards. Since the user button is enabled as a wakeup source, also ensure the GPIO pin is mux'd correctly and has IO ring wakeups enabled, so it can also wakeup from off mode. Special thanks to Florian Vaussard for suggesting the preprocessor feature. Cc: Florian Vaussard <florian.vaussard@epfl.ch> 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-xm.dts')
-rw-r--r--arch/arm/boot/dts/omap3-beagle-xm.dts25
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 7fb806d..ad17b6b 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -57,6 +57,26 @@
ti,mcbsp = <&mcbsp2>;
ti,codec = <&twl_audio>;
};
+
+ gpio_keys {
+ compatible = "gpio-keys";
+
+ user {
+ label = "user";
+ gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+ linux,code = <0x114>;
+ gpio-key,wakeup;
+ };
+
+ };
+};
+
+&omap3_pmx_wkup {
+ gpio1_pins: pinmux_gpio1_pins {
+ pinctrl-single,pins = <
+ 0x0e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE4) /* sys_boot2.gpio_4 */
+ >;
+ };
};
&i2c1 {
@@ -140,3 +160,8 @@
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>;
};
+
+&gpio1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio1_pins>;
+};