From patchwork Fri Jun 23 08:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrizio Castro X-Patchwork-Id: 695995 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0226EB64DD for ; Fri, 23 Jun 2023 08:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230481AbjFWIBr (ORCPT ); Fri, 23 Jun 2023 04:01:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjFWIBr (ORCPT ); Fri, 23 Jun 2023 04:01:47 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5DC4E1BE2; Fri, 23 Jun 2023 01:01:45 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.01,151,1684767600"; d="scan'208";a="168666974" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 23 Jun 2023 17:01:44 +0900 Received: from mulinux.home (unknown [10.226.93.17]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 838C4400B9F5; Fri, 23 Jun 2023 17:01:40 +0900 (JST) From: Fabrizio Castro To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven Cc: Fabrizio Castro , Magnus Damm , linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Paterson , Biju Das , Lad Prabhakar Subject: [PATCH] arm64: dts: renesas: rzv2mevk2: Fix eMMC/SDHI pinctrl names Date: Fri, 23 Jun 2023 09:01:35 +0100 Message-Id: <20230623080135.15696-1-fabrizio.castro.jz@renesas.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The original commit uses the same names ("data" and "ctrl") for the subnodes of pinctrl definitions for both eMMC and SDHI0 (emmc_pins, sdhi0_pins, and sdhi0_pins_uhs) leading to the below issue: pinctrl-rzv2m b6250000.pinctrl: pin P8_2 already requested by 85000000.mmc; cannot claim for 85020000.mmc pinctrl-rzv2m b6250000.pinctrl: pin-130 (85020000.mmc) status -22 renesas_sdhi_internal_dmac 85020000.mmc: Error applying setting, reverse things back This commit fixes the problem by making the names for the pinctrl subnodes of eMMC and SDHI0 unique. Fixes: b6c0be722b0c ("arm64: dts: renesas: rzv2mevk2: Add uSD card and eMMC support") Signed-off-by: Fabrizio Castro --- .../arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts b/arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts index 39fe3f94991e..11c5cffea5a5 100644 --- a/arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts +++ b/arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts @@ -167,7 +167,7 @@ &i2c2 { &pinctrl { emmc_pins: emmc { - data { + emmc_data { pinmux = , /* MMDAT0 */ , /* MMDAT1 */ , /* MMDAT2 */ @@ -179,7 +179,7 @@ data { power-source = <1800>; }; - ctrl { + emmc_ctrl { pinmux = , /* MMCMD */ ; /* MMCLK */ power-source = <1800>; @@ -197,7 +197,7 @@ i2c2_pins: i2c2 { }; sdhi0_pins: sd0 { - data { + sd0_data { pinmux = , /* SD0DAT0 */ , /* SD0DAT1 */ , /* SD0DAT2 */ @@ -205,20 +205,20 @@ data { power-source = <3300>; }; - ctrl { + sd0_ctrl { pinmux = , /* SD0CMD */ ; /* SD0CLK */ power-source = <3300>; }; - cd { + sd0_cd { pinmux = ; /* SD0CD */ power-source = <3300>; }; }; sdhi0_pins_uhs: sd0-uhs { - data { + sd0_uhs_data { pinmux = , /* SD0DAT0 */ , /* SD0DAT1 */ , /* SD0DAT2 */ @@ -226,13 +226,13 @@ data { power-source = <1800>; }; - ctrl { + sd0_uhs_ctrl { pinmux = , /* SD0CMD */ ; /* SD0CLK */ power-source = <1800>; }; - cd { + sd0_uhs_cd { pinmux = ; /* SD0CD */ power-source = <1800>; };