From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1451573-1517181445-2-14094131837426671788 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181444; b=gJTR//jIo6VBbUbKh4+lSo56OkAVXpRcTFYk6cUU1lu5y2p q8GPZIPLL3+lRrrVGLGRup2d5r1gddHUPhpcjn1sHDVPdCE2a/6eJG5zsy2T2gc8 ZuW+Il1OGGiiePkTv1O5UN0TB11TORHWKtfLpVpdWjjxxs/9TITfL0LVXjumZh+z HVTj/k10foVnnJ39csJ0n2c1XiuJhM5+VkFADdrP13H2mx8v74WTlaoUk+9WTc2s UoJ4fjNPJMi6W0dmg8apGk1DgLDb47Oni0Gn/uawEpzknS58Ps7b/cBwMRzFdK2D mSpysCCtuD1h96tDfDaF1sm7hPny8w33dlZy7EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181444; bh=oSP87E 3avUAvJEfqJgcUplRLInpBcq3eGlGYlYQYaCA=; b=bDJOj5l9eAiJyxH/yL/Avd ZFwYRaHs+qDh2Qoj3j2VNTtu7vvo7Ef1lVZXw9yUBKfkadg9GibsDZDH05il/sj9 wUf+PDGnTc0CUyjJ/5e25DqXh9hDonYQWMPlD0VbeU6oMHX2QFNpT/5BsK9sFfaA JRARuGMmIDfY3NnVhJE2Wzdt7iCTM1XPxY12hKCS/LEx1hJaH9FMJa9rTOifqUTj 8zgwfy9ImloaLs8g6xId6tu4yl/fUgJQNwGQ1BhRFswz4aU7Kd6dTD+TpEkl6IRk anWfPA73xndM1BLspnx1h+HCPYqjsjT0UJfEDfu2WwoHivFc2fS4LaO1Yy57RlYA == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=d1cP+tyG x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=d1cP+tyG x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931AbeA1XRU (ORCPT ); Sun, 28 Jan 2018 18:17:20 -0500 Received: from mail-bn3nam01on0107.outbound.protection.outlook.com ([104.47.33.107]:56768 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751914AbeA1W0I (ORCPT ); Sun, 28 Jan 2018 17:26:08 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Adam Ford , Tony Lindgren , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.14 007/100] ARM: dts: logicpd-somlv: Fix wl127x pinmux Thread-Topic: [PATCH AUTOSEL for 4.14 007/100] ARM: dts: logicpd-somlv: Fix wl127x pinmux Thread-Index: AQHTmIb5JrO2LqgIfEq6uxPDDaWQ+w== Date: Sun, 28 Jan 2018 22:25:59 +0000 Message-ID: <20180128222547.7398-7-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1098;6:3zXIO6I9vATVbHO5ggdeFHz90N8iNQStO2q0eQZDj//QUMwzzZUhGJeRIMFq7eeISkm1U9D0eM1EVKygS+XeQ8Ro9htt558cx81e+FoXFB9u/XHG3HcvWGA5m8I2nrz0vByUql6lcsSZbK3sI+ykS3QKt5rCzsgeig+9nJpoiHVWicGzfUsOvwwqIsqnYvlTWDWMWOOa1EA6JGy3nYN2AgfT84nrpgykQiEaTD2m7A7sPpM9o5uvYwnrtvgOAvcVlXhigcqYvzrx2wHheWjXrpanw8wXCXa0E0X+C/XGPBPzoNHMXFcTcRmm7NpBFBLjFHSHMt4KCa5e9FGyS71rYbk3QYgE4ktyde0fOKxwIKbwSmhnpJKDUi6rtIlj9r1R;5:DggCvrwkzADRyQun9HgQ7vKcEa0sKobda/L6N0IQprh9PNn1eeMw8iumUTzeyGBXp65HPmSjoG6B1loJClDmdw32YtX6y4iMZn89h07W4WghyZRpxFI9kjC66R8A+dRjVV9lIDk9CRDqLhW51THEJ/Xz53sYJf9t4zLSrRJephM=;24:yUOadEs7r7cHYVvEtSLZYhOSohFpeVWVOdQehCUWcojDSdrGw0A431WjDEqt3ykzshhY+P8KVyaM2vUPIBAHcF4RrEbGstp5zwwSpUq/Pw4=;7:9ZLNUQDKoHieeELV6KzKZwqFrDpy0G+dCVZG/h+IPFOG3ygryw0PvNVTzJ5F5m74q6Ria9Pm91od8dDeVcsqIlL2qKYiRVgwVbUtVCW2w3Ht9V85wRYLO7NsCXAhPYIGPjddNld01QGK8IxxBLPpV7xL4pZbwbbJglmXEwy+dNEhRJpejO/1sKbazSjy+ITYNFnDbw5VGZAzzqNbFQ3PqYk+OLPTeT7zyaEjbq2H+98817+lDf1+HNG9FExOBM9e x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ac008c90-15f1-4809-5c67-08d5669e1d07 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(575784001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(39060400002)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 9msWIhc4uozZG44RkTTOYJJzNs9Ag4PE4nxMBOZ2dH8rD01jddnDy+rMvk9e7braBzorbLr57Buphr31LP7exQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac008c90-15f1-4809-5c67-08d5669e1d07 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:25:59.9535 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- arch/arm/boot/dts/logicpd-som-lv.dtsi | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logi= cpd-som-lv.dtsi index c5edc7fe4837..4f2c5ec75714 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -121,7 +121,7 @@ =20 &mmc3 { interrupts-extended =3D <&intc 94 &omap3_pmx_core2 0x46>; - pinctrl-0 =3D <&mmc3_pins>; + pinctrl-0 =3D <&mmc3_pins &wl127x_gpio>; pinctrl-names =3D "default"; vmmc-supply =3D <&wl12xx_vmmc>; non-removable; @@ -132,8 +132,8 @@ wlcore: wlcore@2 { compatible =3D "ti,wl1273"; reg =3D <2>; - interrupt-parent =3D <&gpio5>; - interrupts =3D <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */ + interrupt-parent =3D <&gpio1>; + interrupts =3D <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */ ref-clock-frequency =3D <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.s= dmmc3_cmd */ OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.s= dmmc_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 =3D < + OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */ + OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ + >; + }; }; =20 &omap3_pmx_core2 { --=20 2.11.0