From patchwork Tue Oct 31 18:45:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10035177 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CAD5260327 for ; Tue, 31 Oct 2017 18:46:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BED4628988 for ; Tue, 31 Oct 2017 18:46:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2F7D289E2; Tue, 31 Oct 2017 18:46:07 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 6107528988 for ; Tue, 31 Oct 2017 18:46:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324AbdJaSqG (ORCPT ); Tue, 31 Oct 2017 14:46:06 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:56288 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751316AbdJaSqF (ORCPT ); Tue, 31 Oct 2017 14:46:05 -0400 Received: by mail-io0-f194.google.com with SMTP id p186so908862ioe.12 for ; Tue, 31 Oct 2017 11:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xM8V6fjwEvn5ZL1K7b/C+W74lUg2NHEcaDBuzkPVy/I=; b=dh2fV04LE81TvWMNHUUfYelGWlHf7p5ddyVTxoBQ20av1rNaePww2Nad3T+IHSU08x hgiohf7dmBgtgukl/G9NeiaEaMKM49WG2ZJe0SUKv8pX530AYTUSiORGBCSQv82c0EqC fxYPUXkWpSpL8sGWuOkEYGUmlf8Lo0l4K9sZY9STWoysP9vPjubMXsJEAavB2PlH5ipZ oHdFrSAlJvVRayx8exd0AvjkbczXWhH0qR8JwNzxW1PVIYvTEq+EkTSw2QARBkA694S6 uR7AhI3J1CSFKX8d3rEmRfek7HvqUlbd30Go0nGB/kflcbqa8G3SrRWSgLBHipPgAC6p KXAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xM8V6fjwEvn5ZL1K7b/C+W74lUg2NHEcaDBuzkPVy/I=; b=JSUtGr/cwSPUavYLqqIs08Y6OEXPtSw4N47Ms7KKCJmNBwGE8ncwJPYQDoBwTA0YSu 804O7Pm6pONYYzq7Ytm/zhkgOdBMxtFtBO6ltb01NkE+wHHvwxevWSVBssiXycutYLAd hM0pGWdj6F94DhRL6zW0quA7J6+SeB+7aVz8T3+FBRw8e++A6KLqL0SKs7RPEZMv7kTF KeGF7beIaaccpcD6nb7S2XOjuZP6YJrCYli3Q1uhYXp2ht4wuCoUrnP6mhZA14TEFQIy yHnB6LOlqebgym4yXnKptJOwdgKjpFSfNwvIRTYDrtgg5YRilRjT3vJjreY5VgG4gIhk 3x/Q== X-Gm-Message-State: AMCzsaVXi3gGxUI8qYCvRAkRi7msGTlzaV1MepnEW/RZGMOz0oNSWDpK ACsQfH2nxTnQLmQAqXF0QonWeA== X-Google-Smtp-Source: ABhQp+TAtqBvy7i/t/6zmAg4FkUIjTaEBdUuOMrtKFHpTrCaBf1aaCu7Zc11aiYX+EaCIIoPP7O68A== X-Received: by 10.107.163.15 with SMTP id m15mr3849615ioe.61.1509475564812; Tue, 31 Oct 2017 11:46:04 -0700 (PDT) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id m22sm900305iob.47.2017.10.31.11.46.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 11:46:04 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Cc: Adam Ford Subject: [PATCH V2] ARM: dts: logicpd-somlv: Fix wl127x pinmux Date: Tue, 31 Oct 2017 13:45:59 -0500 Message-Id: <1509475559-7227-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 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 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 V2: Fix GPIO 2 comment and move 'fixes' to end the commit message diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index c5edc7f..4f2c5ec 100644 --- 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 {