From patchwork Thu Sep 15 19:10:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 76341 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp114216qgf; Thu, 15 Sep 2016 12:11:40 -0700 (PDT) X-Received: by 10.98.205.66 with SMTP id o63mr16870935pfg.37.1473966700547; Thu, 15 Sep 2016 12:11:40 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bx7si5012678pac.110.2016.09.15.12.11.40; Thu, 15 Sep 2016 12:11:40 -0700 (PDT) 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 S1754118AbcIOTLi (ORCPT + 27 others); Thu, 15 Sep 2016 15:11:38 -0400 Received: from bear.ext.ti.com ([198.47.19.11]:44788 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752197AbcIOTLg (ORCPT ); Thu, 15 Sep 2016 15:11:36 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id u8FJB2DQ012705; Thu, 15 Sep 2016 14:11:02 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id u8FJB2nU014592; Thu, 15 Sep 2016 14:11:02 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Thu, 15 Sep 2016 14:11:02 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u8FJB2ro016947; Thu, 15 Sep 2016 14:11:02 -0500 From: Nishanth Menon To: Tony Lindgren , =?UTF-8?q?Beno=C3=AEt=20Cousson?= CC: , , , , Nishanth Menon Subject: [PATCH] ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2 Date: Thu, 15 Sep 2016 14:10:59 -0500 Message-ID: <20160915191059.18190-1-nm@ti.com> X-Mailer: git-send-email 2.10.0 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit d20f997b4d1f ("ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869") fat fingered a change in which basically replaced mmc2_pinctrl_default with mmc1_pinctrl_default. And kernel dutifully reports conflict of usage. [...] [ 4.767335] pinctrl-single 4a003400.pinmux: pin 4a00376c.0 already requested by 4809c000.mmc; cannot claim for 480b4000.mmc [ 4.778976] pinctrl-single 4a003400.pinmux: pin-219 (480b4000.mmc) status -22 [ 4.786427] pinctrl-single 4a003400.pinmux: could not request pin 219 (4a00376c.0) from group mmc1_pins_default on device pinctrl-single [ 4.799328] omap_hsmmc 480b4000.mmc: Error applying setting, reverse things back [ 4.807110] omap_hsmmc 480b4000.mmc: could not initialize pin control state [...] But, thanks to the fact that we were in fact setting all the muxes in U-Boot, all the MMC devices were still properly detected. Fix the typo. Fixes: d20f997b4d1f ("ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869") Reported-by: Tony Lindgren Signed-off-by: Nishanth Menon --- Patch based on: omap-for-v4.9/dt-pt2-signed git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git Before this patch (as in the original series http://pastebin.ubuntu.com/23124704/ - error visible, but was'nt caught) After this patch, on rev B1: http://pastebin.ubuntu.com/23183323/ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.10.0 diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi index ec85ff9004e8..6df7829a2c15 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi @@ -451,7 +451,7 @@ status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_default>; + pinctrl-0 = <&mmc2_pins_default>; vmmc-supply = <&vdd_3v3>; bus-width = <8>;