From patchwork Wed Aug 1 20:28:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 10552941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77182157D for ; Wed, 1 Aug 2018 20:28:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69BF02B45E for ; Wed, 1 Aug 2018 20:28:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E1142B4A5; Wed, 1 Aug 2018 20:28:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1263D2B45E for ; Wed, 1 Aug 2018 20:28:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728918AbeHAWP6 (ORCPT ); Wed, 1 Aug 2018 18:15:58 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:37301 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728226AbeHAWP6 (ORCPT ); Wed, 1 Aug 2018 18:15:58 -0400 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 68FF8806C8; Wed, 1 Aug 2018 22:28:25 +0200 (CEST) Date: Wed, 1 Aug 2018 22:28:21 +0200 From: Pavel Machek To: Tony Lindgren Cc: Sebastian Reichel , kernel list , linux-arm-kernel , linux-omap@vger.kernel.org, nekit1000@gmail.com, mpartap@gmx.net, merlijn@wizzup.org Subject: [PATCH] fix vibrations on Droid 4 Message-ID: <20180801202821.GB4033@amd> References: <20180709081534.GA6799@amd> <20180709214910.tes6u4ivxomd3aja@earth.universe> <20180709220211.GA7760@amd> <20180710101147.lyu65ro4czvrs2da@earth.universe> <20180710133040.GA4391@amd> <20180710161123.azym6sbboriuj4yc@earth.universe> <20180711080218.GA21225@amd> <20180711132739.GL99251@atomide.com> <20180715201729.GB19675@amd> <20180716075926.GU99251@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180716075926.GU99251@atomide.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Vibration GPIOs don't have anything to do with wakeup. Move it to normal section; this fixes vibrations on Droid 4. Signed-off-by: Pavel Machek Reviewed-by: Sebastian Reichel diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts index c27fc87..7b82179 100644 --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts @@ -646,15 +646,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 = < @@ -669,6 +660,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 * uart1 wakeirq.