Received: by 10.223.185.116 with SMTP id b49csp1075757wrg; Fri, 23 Feb 2018 11:28:56 -0800 (PST) X-Google-Smtp-Source: AH8x226RmKHuq7XFVfpa1vo8PwYTO7mJje0YZFT1CUqaIdqiIikHWEnm6rWjnMZPwI06USoSl/bH X-Received: by 10.98.59.11 with SMTP id i11mr2774694pfa.57.1519414136434; Fri, 23 Feb 2018 11:28:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519414136; cv=none; d=google.com; s=arc-20160816; b=Nt5wMeJbfkU5BcUWKb4qKBZ5WIscZRPl8LZQs8foeFZ/o1xTBdlQsOvYstEf4J9FWN 8Kb3c2ZJfqLyJ7J/uty8cq7J/zEej6dRTHDfzM6JVSAzrhsX1lt0p9Swy/0Q0vDAqczH rYU3PYR4Ms6T3Hfj9Fdi8Zi5nx0b5ly8i4NoynLBvwSf0UOFIlXWNJIE0DOWArOY9sTQ IC3v+XHlWhzt8dUUubEF3CrpfoNn7BRHYOF5GUP92/DbBpJ4HBBsFSOWMp/jmzZda5w/ f+6LLRM/ldOxOMiCBApmpohsqyMEExB6jAub0RWN6wJbre59EkGM1rDNkufoQCVN4IsU xvXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rwWu4s2sm2J+10jV+AkYtB5LIlYA14gRivMLW6bCdTY=; b=NuUQn5Y/LRZu+jToo8q8Fr59RTMDOuGTv6Nq9lAGbiTAHWgSxedJlCE/fSmCPw/O6a nXs853//1r4TTN8YssBCcmhAOey4iqKJTzp5Qh2eXr2+/c8J5i6li2RDSFYQLY1TKTfb 2fBAocQdzixB7Ht6sMvcHJHwH78geMVXOUDd/3Lbt+CqWqz1cIbuYvlDn3IOkncDgaaX vR91+XamxmpjLGz7NIsQMtNwVDlmfFKyQqP7LfttMgOqVQDXuK/pjfzUZBbM1y+r/Auz XSduEkSEWJPG/2WPjaV/J1nAo4NB/OUS1kdJo3BGP7hH9WgqjRNf0Gkd4gajBVGNTL8Y nDNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a34-v6si2189744pld.505.2018.02.23.11.28.42; Fri, 23 Feb 2018 11:28:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935152AbeBWT2H (ORCPT + 99 others); Fri, 23 Feb 2018 14:28:07 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:46802 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935100AbeBWSwM (ORCPT ); Fri, 23 Feb 2018 13:52:12 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A59ADED1; Fri, 23 Feb 2018 18:52:11 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adam Ford , Tony Lindgren , Sasha Levin Subject: [PATCH 4.14 065/159] ARM: dts: logicpd-somlv: Fix wl127x pinmux Date: Fri, 23 Feb 2018 19:26:13 +0100 Message-Id: <20180223170751.436340815@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Adam Ford [ Upstream commit cd7594ac3281722cb8f10d6f6c7e4287747c7a9d ] The pin assignment for the wl127x interrupt was incorrect. I am not sure how this every worked. This also eliminates a conflict with the SMC911x ethernet driver and properly moves pinmuxes for the related gpio to omap3_pmx_wkup from omap3_pmx_core. Fixes: ab8dd3aed011 ("ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV") Signed-off-by: Adam Ford Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/logicpd-som-lv.dtsi | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -121,7 +121,7 @@ &mmc3 { interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>; - pinctrl-0 = <&mmc3_pins>; + pinctrl-0 = <&mmc3_pins &wl127x_gpio>; pinctrl-names = "default"; vmmc-supply = <&wl12xx_vmmc>; non-removable; @@ -132,8 +132,8 @@ wlcore: wlcore@2 { compatible = "ti,wl1273"; reg = <2>; - interrupt-parent = <&gpio5>; - interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */ + interrupt-parent = <&gpio1>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */ ref-clock-frequency = <26000000>; }; }; @@ -157,8 +157,6 @@ OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */ OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */ OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */ - OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */ - OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */ OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */ >; @@ -228,6 +226,12 @@ OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */ >; }; + wl127x_gpio: pinmux_wl127x_gpio_pin { + pinctrl-single,pins = < + OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */ + OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ + >; + }; }; &omap3_pmx_core2 {