lkml.org 
[lkml]   [2018]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 181/228] ARM: dts: omap4-droid4: fix vibrations on Droid 4
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Pavel Machek <pavel@ucw.cz>

    [ Upstream commit f4efa74c09a7eddcc12cd13208f78743763f6e7a ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/arm/boot/dts/omap4-droid4-xt894.dts | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
    +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
    @@ -618,15 +618,6 @@
    OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */
    >;
    };
    -};
    -
    -&omap4_pmx_wkup {
    - usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
    - /* gpio_wk0 */
    - pinctrl-single,pins = <
    - OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
    - >;
    - };

    vibrator_direction_pin: pinmux_vibrator_direction_pin {
    pinctrl-single,pins = <
    @@ -640,6 +631,15 @@
    >;
    };
    };
    +
    +&omap4_pmx_wkup {
    + usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
    + /* gpio_wk0 */
    + pinctrl-single,pins = <
    + OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
    + >;
    + };
    +};

    /*
    * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for

    \
     
     \ /
      Last update: 2018-10-02 15:30    [W:7.482 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site