From nobody Tue Apr 7 04:35:04 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4E4B39B979 for ; Mon, 16 Mar 2026 14:04:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773669872; cv=none; b=hr9exidxi9VxYmRBUQ3G06h94uJ+WZaCBCKekwj9o6zQUzIu9t2iv5yW7epbrefcIxZ3++m70XuOJejNIHlaqbv+bneCq+C4XyhqORyFqArhKra45qUwKBR8i/fBnShfHtuS/kUxe3hC43bc+NFG5j3mUOMBAzwk8ja0Hc2OE+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773669872; c=relaxed/simple; bh=epbnSIRFEcgFtseIgir8HKOEck/DcrGNKZLBIi+3AcY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o39/q7HlCoq2f7RSdzqq3u339goVdvRTkWLijSq4ydBJdaTXUC73CDzXHOn3mH6q68TsJrwPaNt/YAgVCsnPgq23RwjtWr0UFHTxJ+ed6SeZPlextYrNV1kzR+QOW1+uYIo1XK99bNF71b8EUHTyNhNnUZAeD47ruvgdpOtvlKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eE3Eo1RC; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eE3Eo1RC" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-439b2965d4bso3208009f8f.2 for ; Mon, 16 Mar 2026 07:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773669868; x=1774274668; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IatXzbXfYasV7clQDZ74AZFa+ggBYqSvKjib0f90qgA=; b=eE3Eo1RCYJK1C+/a3vbyx/q9uB8XQjN58P/y7fvIpo3tNUehZKpTii/jRVqKsvSiTE YMmJlU3g/aSHPaHMLOGerCpvRbJ7ynJAL4xGNpOrp4bpXNkWvjIUo0XVOHFCk51K5soO 0lFJ9ba5lU2JdU4x00y8q4mj2CdnfqzELNTkxNnPEoiNinUQI2gipwgDz2HhPLZLaQYm DyVzJfynPS48+lpH8GFt6JgqalHOOFcR/nN5ZocvS5/zXC8JogSXbG+TKTfy5WEFMLrp VY80GTA3m5Sf1a4L+v39c/lqileu08vz0QAxJ29Pv1cggqfA5TmqxdZJITrupbLPQljS nEwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773669868; x=1774274668; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IatXzbXfYasV7clQDZ74AZFa+ggBYqSvKjib0f90qgA=; b=UVSSYpxO6EACz+kovcaSSUqSMaF80FhC7rJe/rcMPqPGdRVRrXAQ/SkdfxysEDGzay HWD5IXHiq+sC7ot0yIFY0p0uTfPrZWT8yTBB3WHWEi+PUlUqIkHo8OrDetG7b++QlcoR 3Ohf+EW6OCriXH/D6hWxIsmW2nqSga6/+znSlua4Cso0sj/W3nSfqdhTBoRBZ3BN5Ir7 t3/sFwb96rUIL6pU2qcF2/vc9RTSZ6vkCuLxBSZ1Sxc88H9hu7WrDwrEowAIsiZ+qxgx TXudAQSY04s/nL9Zpd8YBApjjZLiq0X5FstdL247Zf1KBgw859edoK3lvEFjK+eguQWy CSVw== X-Forwarded-Encrypted: i=1; AJvYcCVPGRiy6GRhkgHY6Wvb4lBNkeATUsJ7qcg6ggxiiORSmtCS1Ci+9XF5CwWaBCAyw/vN20mO2hworP0u+Eg=@vger.kernel.org X-Gm-Message-State: AOJu0YwC2y7PhhdlJQ5pnCLowqh/Kn2PbSBI8GDHduauTv2vpDSxWD24 TtRU/qJGYWYymyLTCjfiPj9DTS3y1jzz/hEyol/Q9cQnmw+CBgGnILxf X-Gm-Gg: ATEYQzypIpGsZpm4vrwSfNxI9Dclpf3htAXH3MWWozUtQ2/9H4uZpgZi55UW4Bx+DP3 kYHC9sOqkDWfeGbS5uCOEuvRWHNclKEY5MkuyRH61/3aHs6NJcO9+5lN7MbVEvLaTYi1vYcFd+d fhlMA5G2jbyvq2ULF6bndun6DupU3rTjBpEzFSS9muLfHEF6Ahm/pBVCM0c78PhKYQdGsMSkQWF l3qrOxy2CBm5uWGola6+mg0BCpx6mvyuBm/bQkKPVzWHklRUymShhc44wL6vY5/vdGBbTzpti0v d+InVZFf6YPXksy0LW73Fk91UMj0Ku+SGsXhGqUOBE7k/yw9QhK/0oId+Yyv7k9HtP74Hi7PJfq FbSYVZc6EhLgTZ0gb5Pg3d/E2NPNQBYOIP0ON0flAms6bNGQhuaMck74CS9pvihoX59melNYri/ x3tfN9oi10mh0OmnJBbWgG1pknUSiaIUjHWu+bs0P6DDO503xmkGm/NTcEN55jnofguMcykm3ei rY= X-Received: by 2002:a05:6000:4313:b0:43b:3e40:2223 with SMTP id ffacd0b85a97d-43b3e4024dcmr9315126f8f.19.1773669868020; Mon, 16 Mar 2026 07:04:28 -0700 (PDT) Received: from ipedrosa-thinkpadx1carbongen12.rmtes.csb ([67.218.234.31]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b3a09e453sm20698725f8f.0.2026.03.16.07.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 07:04:26 -0700 (PDT) From: Iker Pedrosa Date: Mon, 16 Mar 2026 15:03:30 +0100 Subject: [PATCH v3 2/7] mmc: sdhci-of-k1: add regulator and pinctrl voltage switching support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260316-orangepi-sd-card-uhs-v3-2-aefd3b7832df@gmail.com> References: <20260316-orangepi-sd-card-uhs-v3-0-aefd3b7832df@gmail.com> In-Reply-To: <20260316-orangepi-sd-card-uhs-v3-0-aefd3b7832df@gmail.com> To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Adrian Hunter , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Yixun Lan , Yixun Lan Cc: Michael Opdenacker , Javier Martinez Canillas , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, linux-kernel@vger.kernel.org, Iker Pedrosa , Anand Moon X-Mailer: b4 0.14.2 Add voltage switching infrastructure for UHS-I modes by integrating both regulator framework (for supply voltage control) and pinctrl state switching (for pin drive strength optimization). - Add regulator supply parsing and voltage switching callback - Add optional pinctrl state switching between "default" (3.3V) and "state_uhs" (1.8V) configurations - Enable coordinated voltage and pin configuration changes for UHS modes This provides complete voltage switching support while maintaining backward compatibility when pinctrl states are not defined. Tested-by: Anand Moon Signed-off-by: Iker Pedrosa --- drivers/mmc/host/sdhci-of-k1.c | 58 ++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 58 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-k1.c b/drivers/mmc/host/sdhci-of-k1.c index 0dd06fc19b8574ae1b00f7e5d09b7d4c87d06770..01afdadcf70796704b272ee5a31= 543afd5e01188 100644 --- a/drivers/mmc/host/sdhci-of-k1.c +++ b/drivers/mmc/host/sdhci-of-k1.c @@ -16,6 +16,7 @@ #include #include #include +#include #include =20 #include "sdhci.h" @@ -71,6 +72,9 @@ struct spacemit_sdhci_host { struct clk *clk_core; struct clk *clk_io; + struct pinctrl *pinctrl; + struct pinctrl_state *pinctrl_default; + struct pinctrl_state *pinctrl_uhs; }; =20 /* All helper functions will update clr/set while preserve rest bits */ @@ -219,6 +223,33 @@ static void spacemit_sdhci_pre_hs400_to_hs200(struct m= mc_host *mmc) SPACEMIT_SDHC_PHY_CTRL_REG); } =20 +static void spacemit_sdhci_voltage_switch(struct sdhci_host *host) +{ + struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); + struct spacemit_sdhci_host *sdhst =3D sdhci_pltfm_priv(pltfm_host); + struct mmc_ios *ios =3D &host->mmc->ios; + int ret; + + if (!sdhst->pinctrl) + return; + + if (ios->signal_voltage !=3D MMC_SIGNAL_VOLTAGE_180) { + dev_warn(mmc_dev(host->mmc), "unsupported voltage %d\n", + ios->signal_voltage); + return; + } + + if (sdhst->pinctrl_uhs) { + ret =3D pinctrl_select_state(sdhst->pinctrl, sdhst->pinctrl_uhs); + if (ret) { + dev_warn(mmc_dev(host->mmc), + "failed to select UHS pinctrl state: %d\n", ret); + return; + } + dev_dbg(mmc_dev(host->mmc), "switched to UHS pinctrl state\n"); + } +} + static inline int spacemit_sdhci_get_clocks(struct device *dev, struct sdhci_pltfm_host *pltfm_host) { @@ -252,12 +283,37 @@ static inline int spacemit_sdhci_get_resets(struct de= vice *dev) return 0; } =20 +static inline void spacemit_sdhci_get_pins(struct device *dev, + struct sdhci_pltfm_host *pltfm_host) +{ + struct spacemit_sdhci_host *sdhst =3D sdhci_pltfm_priv(pltfm_host); + + sdhst->pinctrl =3D devm_pinctrl_get(dev); + if (IS_ERR(sdhst->pinctrl)) { + sdhst->pinctrl =3D NULL; + dev_dbg(dev, "pinctrl not available, voltage switching will work without= it\n"); + return; + } + + sdhst->pinctrl_default =3D pinctrl_lookup_state(sdhst->pinctrl, "default"= ); + if (IS_ERR(sdhst->pinctrl_default)) + sdhst->pinctrl_default =3D NULL; + + sdhst->pinctrl_uhs =3D pinctrl_lookup_state(sdhst->pinctrl, "state_uhs"); + if (IS_ERR(sdhst->pinctrl_uhs)) + sdhst->pinctrl_uhs =3D NULL; + + dev_dbg(dev, "pinctrl setup: default=3D%p, uhs=3D%p\n", + sdhst->pinctrl_default, sdhst->pinctrl_uhs); +} + static const struct sdhci_ops spacemit_sdhci_ops =3D { .get_max_clock =3D spacemit_sdhci_clk_get_max_clock, .reset =3D spacemit_sdhci_reset, .set_bus_width =3D sdhci_set_bus_width, .set_clock =3D spacemit_sdhci_set_clock, .set_uhs_signaling =3D spacemit_sdhci_set_uhs_signaling, + .voltage_switch =3D spacemit_sdhci_voltage_switch, }; =20 static const struct sdhci_pltfm_data spacemit_sdhci_k1_pdata =3D { @@ -324,6 +380,8 @@ static int spacemit_sdhci_probe(struct platform_device = *pdev) =20 host->mmc->caps |=3D MMC_CAP_NEED_RSP_BUSY; =20 + spacemit_sdhci_get_pins(dev, pltfm_host); + ret =3D spacemit_sdhci_get_clocks(dev, pltfm_host); if (ret) goto err_pltfm; --=20 2.53.0