From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180184-2-10023468730911094105 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=1517180183; b=nv8fnji9BMk1PVkhyvdMYMO9aBaoGLIt2jl3uBp6GEMTmTH uX58xevrxCyTdYME3JdfJ1Sfd6yCesgxFBZs8j2V9ZMOe6JUwCabTrAuwT/s5l5j AxFUnim9McXkOA3VUqvl6bDdk6wTKd/Xo55hYTy8bZ2Q31rdv10pS55kPzEyTPPd NR+smR9xnYOOlK3663vE2gs26o/UwuQUQdzJjdSfMdunn2EkQNoM/GmpxgP2UYsC 2zkSw9U8smf0UmHYe8OfqGGoimtAy1qWwVGx8xImPCPR+FKcdMxpqVX/uGSKcTgx zhHZMINm/uoRV/SuiR0Um9slb+jr/ZoLAiLhLBQ== 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=1517180183; bh=oSP87E 3avUAvJEfqJgcUplRLInpBcq3eGlGYlYQYaCA=; b=Lk4I3yqwQkTvoNYaJkQuys Pk6fs042ckRZMfjCi5OT4LX1xNbzyhsnchiq1hLnOXaZPRH0xfT4ix+stuPJmz34 DVXAFWywhyLc15Yv126BGfdl364ZAR5tDAt3dUfdxK9nH56vYg40uVQoVzp8k/ny kAGhZMG+dQwVYPuA7vaKX5p7mn8oU9fNDKqtInlEPHWcjjVN0Lz/W0P41VmHAi4D M78WwR9Gny7je+JIySUEnoLtLz7nsCX5YyFKg4F+U+DsXKo+xnfFkmZ7GHbAnHn2 G3IL2VE82b4xkAz+3jmAL3iFNmnnysUPPM9RTww0p/Np/raBhFqE/Paah+Ib8n2g == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=FN+qfsnI 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: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=FN+qfsnI 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 S932075AbeA1Wzj (ORCPT ); Sun, 28 Jan 2018 17:55:39 -0500 Received: from mail-sn1nam02on0134.outbound.protection.outlook.com ([104.47.36.134]:55568 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932104AbeA1W22 (ORCPT ); Sun, 28 Jan 2018 17:28:28 -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.9 06/49] ARM: dts: logicpd-somlv: Fix wl127x pinmux Thread-Topic: [PATCH AUTOSEL for 4.9 06/49] ARM: dts: logicpd-somlv: Fix wl127x pinmux Thread-Index: AQHTmIc0W8V1CM/bkEaAosrkLGuVmQ== Date: Sun, 28 Jan 2018 22:27:39 +0000 Message-ID: <20180128222727.22404-6-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB1017;6:e6oJsobF1cgtd2SvPBW4u2OhTYnWMQa4DL9STrgUDoU/h3Z1p2j79ZLB+I3+GgSShYPA1XxDLCrWSRJvq4V1LIm/R6/wBEECcsqe5EuZt5yQWLo9Jr5xyT2zpqQhJmLIWLp8EI4/6n4sV8MVccMmmzjyUMucPfRvuiKCpFRutkX1A2nyDauZBOGQ1EMAh/YDwEk4zmnl8A3WBZvrprJenIBKnv3nDIwoQk3VDl2DKE7bqlTGb2Y1H+y/DMoD3kAcUmunvoQnShw+4QcTqHqKW/cfjRtPJckYzfHd6zC5zGWHuRyL4T4hcxnEFuqCsQFTQtzvEk6J3OKxdD2k3aaSOj6M/aS0lvn+50YJVJjrM/hR469pRQXiUGoOQknxwfdB;5:D4nSHz71MPqIdWG11sL3N/3532sQ4Hb54KXfmNWMQfA6PphvoW6RJDoDE2mzrH0V/a6DDo30dbujWiZInVWbZOLdGD5gbRV6+ARDe3foSD/N4yOkgpBMj7ghZR+vCKLZiGtmXV7AF+miN+HCxNHu2jM402egnwSYuax/RpVE09Q=;24:5xMovU1dOXieIsEHxCuNxaE/2Jx9ezcAmGdqLGLj9bZWtEN0SPQ2EsEkTCZc8vQlRzipnPECCnBKFGP6DHaHNHIiY6UPUS1YPGzeGVa2TcM=;7:qUlmwSBihnlVG6kEgiZzd6wiqvCpdWdWQlcryzhtBPUK1jRW2TANl8MJxKtzi1pItMBMhxIBq2w4Dg6J1DILquCr/OXpztC5t+IxDUlqNkUA+Hta4q8G/20bbuKzRLRUUaggNf6f23t8xpS5RuyU9RkgO1OaJRnP2eK0dDkOo7iB2olGmpxekHfkSmreUOMjDOuA0lUOChfwRIzEYZs/MsavKbPGYQ1ZLz9VvA1HJrIilnSCCyaYGwhFvh14xv5X x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: e82a29b1-e564-4513-901b-08d5669e7097 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1017; x-ms-traffictypediagnostic: MW2PR2101MB1017: 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)(10201501046)(3231101)(944501161)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB1017;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1017; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(39380400002)(366004)(346002)(376002)(189003)(199004)(81156014)(6666003)(305945005)(2900100001)(76176011)(68736007)(86612001)(3660700001)(8676002)(3280700002)(6506007)(102836004)(6116002)(105586002)(7736002)(2950100002)(3846002)(1076002)(106356001)(36756003)(5660300001)(2906002)(8936002)(66066001)(10090500001)(6486002)(6512007)(25786009)(53936002)(186003)(316002)(6436002)(86362001)(575784001)(14454004)(478600001)(2501003)(5250100002)(72206003)(39060400002)(99286004)(97736004)(107886003)(4326008)(54906003)(81166006)(110136005)(26005)(10290500003)(22452003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1017;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: +bYpDpvRfiFeisNucQ0jKNtUj2QpNT359wh4ae5PMMz+5r/avazhTz9vP2pX6DMn2w0YRPTrFm1dHjiRQxOQfw== 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: e82a29b1-e564-4513-901b-08d5669e7097 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:39.4166 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1017 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