aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2018-08-01 16:28:21 -0400
committerTony Lindgren <tony@atomide.com>2018-08-22 11:04:49 -0400
commitf4efa74c09a7eddcc12cd13208f78743763f6e7a (patch)
tree4778f0957779848b8fb654bcf4263380e5614d76
parent4f3530f4a41d49c41015020cd9a5ed5c95b5d2db (diff)
ARM: dts: omap4-droid4: fix vibrations on Droid 4
Vibration GPIOs don't have anything to do with wakeup. Move it to normal section; this fixes vibrations on Droid 4. Fixes: a5effd968301 ("ARM: dts: omap4-droid4: Add vibrator") Signed-off-by: Pavel Machek <pavel@ucw.cz> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/omap4-droid4-xt894.dts18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index e7c3c563ff8f..edc97f89fae4 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -618,15 +618,6 @@
618 OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */ 618 OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */
619 >; 619 >;
620 }; 620 };
621};
622
623&omap4_pmx_wkup {
624 usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
625 /* gpio_wk0 */
626 pinctrl-single,pins = <
627 OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
628 >;
629 };
630 621
631 vibrator_direction_pin: pinmux_vibrator_direction_pin { 622 vibrator_direction_pin: pinmux_vibrator_direction_pin {
632 pinctrl-single,pins = < 623 pinctrl-single,pins = <
@@ -641,6 +632,15 @@
641 }; 632 };
642}; 633};
643 634
635&omap4_pmx_wkup {
636 usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
637 /* gpio_wk0 */
638 pinctrl-single,pins = <
639 OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
640 >;
641 };
642};
643
644/* 644/*
645 * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for 645 * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for
646 * uart1 wakeirq. 646 * uart1 wakeirq.