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: 10552943 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 7DA2996FA for ; Wed, 1 Aug 2018 20:28:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70CE42B476 for ; Wed, 1 Aug 2018 20:28:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64F962B61D; Wed, 1 Aug 2018 20:28:43 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1B1DF2B476 for ; Wed, 1 Aug 2018 20:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=c7XAnCNNXiGg9hCyM60vyLHkMc+BGj0b2IAsIWmZ99I=; b=h1gUggSFrtJ/R66//WFR38ipt o5CStU4mQDis3M1JIhUiVHOuiXFzkCUNsSY0gN21FgBhUaL5ez+bKIwbg/eEj8ZgnLTj+iH6e+/qs 1JyBZs25d0L+n34uFZ+4EaiiWdwUMZzlaTnyfW3j7LalywjflPw0Hwp7iG23xUZAFPfsJWkm1AuM4 uGCnmbNYZvhmeLRzBXeKwRCGNlCt9ESN+ps4B4Daj3g92zueJmVPnZCH2g1127q1+VB/BFUEbBroU QS5xgsOHllPJ0Bi6VXddd5TVrfaRTwd+3CwoiGAda2b35XVFnBX0xbvLaWDCRLTdmRIkx+K+D6cZx LZMbNFR5A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkxjb-0006SJ-VF; Wed, 01 Aug 2018 20:28:39 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkxjY-0006Qp-NJ for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 20:28:38 +0000 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 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 In-Reply-To: <20180716075926.GU99251@atomide.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_132836_947341_8EBB9B18 X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mpartap@gmx.net, merlijn@wizzup.org, Sebastian Reichel , kernel list , nekit1000@gmail.com, linux-omap@vger.kernel.org, linux-arm-kernel Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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.