From patchwork Sat Oct 28 23:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10031183 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 0EBB560208 for ; Sat, 28 Oct 2017 23:03:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E107028742 for ; Sat, 28 Oct 2017 23:03:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D33522889E; Sat, 28 Oct 2017 23:03:21 +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 5F51C28742 for ; Sat, 28 Oct 2017 23:03:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751442AbdJ1XDS (ORCPT ); Sat, 28 Oct 2017 19:03:18 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:55586 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751381AbdJ1XDR (ORCPT ); Sat, 28 Oct 2017 19:03:17 -0400 Received: by mail-io0-f196.google.com with SMTP id p186so19751337ioe.12 for ; Sat, 28 Oct 2017 16:03:17 -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=IKPCRQKc+XigsfRwGhnWGtTUQPRyfCzTQOb6KIyy08w=; b=ui44TY5KaVI02JBhGZgMOnKDA7Fn9L3WGxyxfimtiqdfIO+hvRubK1kwzjRHcdgjE3 7jkzh2V6dJVSAVFwGRzsA6Sv8rTiWbKHfx9cgkxQKwIyRdoDrL9La+sGaNJAO+kTmY82 nMVF24DUbIGmEhPyIyMQEsUj2pWTK7w+Ta/DBFP2ccvn19afKEBfYs4kVq4sa5CQmpJX kBh2pgjDTYuFb6KhOUPChCUEF86RnlAh0qfVNWsxMovGpSiHih6nEDcX3+n+MQQVrvAX byYnzHZWK152xenA3c/N6Zael/AR+xCtTmtkgfXOJYIKaT43+qxl20OQBz467lSPyLjY CTXA== 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=IKPCRQKc+XigsfRwGhnWGtTUQPRyfCzTQOb6KIyy08w=; b=U6WOCgEK95rkX13tiEOmQHDtYtsD9XbfKT6/LHfPh8YlvgPD9Kkkn7za5HvKF5styr J7l/4yb0AYY6qkOcRRcgXSlj7RMQ3NUjrJqAtriDTtAGlm2dkIfE1zsomSIxk1g9xyvk lfybSiEIVI9agMGRsXSrS3MG8renRZCSsjy3MOlbKLADB2iwg9pAyND9+G4zbUd7OYs4 Mq7TCPzbKDngHb/RnfL7ZUP+3PD2pf+bQHDMkzOzSR7uajZnp6UV5RxmPArOGGiM9zqp cw1YFNVY1CWuhq07ao3hC8F1YMVXPoDEEWzfnsJKr7T5jtIf0fszRufRTboyyVflYtwc CPyg== X-Gm-Message-State: AMCzsaV7jyEMxfT/QVB4cTbGUa0IqAGDfYKvgPjrT2HqObmmfPLDn1gK yjNkuGjtPWmKOonpmQWYuS03zA== X-Google-Smtp-Source: ABhQp+SELert0z5vsn+LNNOiXjqVPD5ergzTh4ecQZqRiUls0jk52mwLBaiJxVBXTPC3H3v+dJKluA== X-Received: by 10.36.172.82 with SMTP id m18mr605808iti.39.1509231796849; Sat, 28 Oct 2017 16:03:16 -0700 (PDT) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id p136sm225818itg.14.2017.10.28.16.03.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 28 Oct 2017 16:03:15 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Cc: adam.ford@logicpd.com, Adam Ford Subject: [PATCH] ARM: dts: logicpd-somlv: Fix wl127x pinmux Date: Sat, 28 Oct 2017 18:03:10 -0500 Message-Id: <1509231790-5768-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 Fixes: ab8dd3aed011 ("ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV") 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. Signed-off-by: Adam Ford diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index b1e34e9..4aaaf49 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -94,7 +94,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; @@ -105,8 +105,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 152 */ ref-clock-frequency = <26000000>; }; }; @@ -130,8 +130,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 */ >; @@ -201,6 +199,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 {