From nobody Thu Apr 9 12:50:25 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 1A2D73A4F5A for ; Mon, 9 Mar 2026 11:40:33 +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=1773056434; cv=none; b=U+VlJat5Xue/s62f2LITzdwqutdMdEudndMpb/ApSAemz1tXSD0nhsnHORfkDrfOQi61M1YB/YPdhtCYoXhLEoKV9kA4tCZtEQBURaJCrhO4+p0cuLYhsTepP3D0+jYXm3xMfXv3G9BCf+TyxlWXMpxOxGzAcw6oyNOTC8eiGmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773056434; c=relaxed/simple; bh=GhO1Ie4U3ZfzS4l/Ko0p5yu5WuTegwhHbdrsMIKUNZ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K8YgIguvo4wMG/TsUXJ0katoj7WZNz7P3qolWW/FhU7FIO0saEHlCg50eSQqWOOEVtAVUH75X+KD0s86rII+v3/ln2CLXIJ3l2UUC+LDcLj2i61n4vgV22GnnoPlpiSYWTgzKGfd6aSfMTjbdZw1WrL5cwxOWLbsRODQYHEJyhk= 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=DmxpFcAa; 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="DmxpFcAa" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-439a89b6fd0so8222247f8f.2 for ; Mon, 09 Mar 2026 04:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773056431; x=1773661231; 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=QJ9vHPA28uIZwZHl6zG8+rB5ttucBEvrM8sqwTl5hfg=; b=DmxpFcAaG7alNzILosNXpfsl2/EqpimYl7Jm0nr7qPYgj06q7uowCLzc/S7u0IVWrf h5oW/AEo1dyK8TrrPLCXkX8XSXoHsNBlReinzSCWbReLuqWJoHVuNy1IrLAtna3MuS8i 6ZOXkCH0pbrisHZ6exDNEP3t7Q/rYm68kGB4hWRSCyRTfuqYee3dnA0BSq3rwYZhKpIz fEuD4BurQg6H61K2PYY9jxv/W4Uw1Ljy2/rKV7C/19LboIo5ctO0yR+1SEMKxcTppRYl RPH2Kc6W5Tn6oCpm1LYvzabn8jsPJP6xZddX9kgmxhdS9lYNgf5+g822G4h9s+XRcpZ4 Hl9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773056431; x=1773661231; 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=QJ9vHPA28uIZwZHl6zG8+rB5ttucBEvrM8sqwTl5hfg=; b=Ra+SmmIzESrB53avxeuamj3dizGZKMAyZ0CdM5475C1+0aQ7dIrd64fcxSWXkL9gyb cQtpzdOPbcl5laNNW9ghpSzDXpg8Va0/qT2DMiGxEradgSNT0noOs9a+fjk8zrlrRc4U D0K/JAVW6YseiP2g9d6QZByq/SvPOmyhqiI49WyOE/G9RghmAEbaJXeuuNKi9gU87rM2 1F/sHxQzbD7y0sNjS3pwBCq/KwhOsAkHoHt9h82jvA093RDpDpmSGMIp+XSOOlN8GfsX HQIsPSSb4WBYb6oJvL/w3166BbXVlF8q2sLx+pfObR2z0qTJ5ViQeHnscx+2bpOiuVXh 4WUg== X-Forwarded-Encrypted: i=1; AJvYcCU0ecSkeaZ4+/ZOs2uq24tT6BvRe1nFTwEfL/pT8VLpCHS6+JyToMyrHpkNF8OkzGHHpMJTfpEnJZr06pg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk2Z4r/RbXg42yuGuXzixmlxH0XXWT+IhCOAyYkLh6wRaFdrGF n95gBGTZ667vo+RARMCQ7gGHL1ret5JsPHkP7eNX2W18HJHmdHkTZX4q X-Gm-Gg: ATEYQzwEtUoLdlbCUlp6hPKXMn5eldic8lxZXy4lO+8gJgfI8/KgJeZ8+jmLot9M5FT ZqpZgMFwB23Ag8e3igmjAgjgiUgLlIplsQX7il/PI54+oWSip5JkcSeQVvtuSUg4LXFeQIm3TJu l44q4iQGr0hG3+SC0tGbhta1HjxTXrZb5P/iAb1SY2OT17lEZ0V3J5+iYsqAq2e8jZLomfKjAgI gQG/qf/ph1z4zZozPle05k2YLlIHlfwKZseNQIzuBvG+BL7ciN1o3tIW/ycHOEm8qSpifUEm34j BmxaQWMkw9BXu7KeA8hvzqj6MePGZ4c3iROEoNqkKTToSjATNhI/PWPQZAIdDxU4BlTjWIpeE1G MRFiXQcMr8mjRrqIWwBIbmfpdtyF2CQr7RKBdUNuJhGdB5WEuPAmVYa/QINat50RBJOLXEJKRTu 0Dl7OJ9gLE2mcV8JQZ4MFukUGF4frgfGo4k3lQwJEY9CIWJ/gFOHTcvfB1SaIW1kRW X-Received: by 2002:a05:6000:24c9:b0:439:cc06:e134 with SMTP id ffacd0b85a97d-439da6632bcmr19064373f8f.24.1773056431160; Mon, 09 Mar 2026 04:40:31 -0700 (PDT) Received: from ipedrosa-thinkpadx1carbongen12.rmtes.csb ([67.218.236.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8ec97sm28471699f8f.5.2026.03.09.04.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 04:40:30 -0700 (PDT) From: Iker Pedrosa Date: Mon, 09 Mar 2026 12:40:12 +0100 Subject: [PATCH v2 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: <20260309-orangepi-sd-card-uhs-v2-2-5bb2b574df5d@gmail.com> References: <20260309-orangepi-sd-card-uhs-v2-0-5bb2b574df5d@gmail.com> In-Reply-To: <20260309-orangepi-sd-card-uhs-v2-0-5bb2b574df5d@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 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. Signed-off-by: Iker Pedrosa --- drivers/mmc/host/sdhci-of-k1.c | 59 ++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 59 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-k1.c b/drivers/mmc/host/sdhci-of-k1.c index 585c7eca6ebf253aac466dd37cef029deb63f692..8af117a8e271c04a80d8dc7bb5c= e12075652dd7a 100644 --- a/drivers/mmc/host/sdhci-of-k1.c +++ b/drivers/mmc/host/sdhci-of-k1.c @@ -15,6 +15,7 @@ #include #include #include +#include #include =20 #include "sdhci.h" @@ -70,6 +71,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 */ @@ -218,6 +222,42 @@ 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; + struct pinctrl_state *state; + int ret; + + /* Select appropriate pinctrl state based on signal voltage */ + if (sdhst->pinctrl) { + switch (ios->signal_voltage) { + case MMC_SIGNAL_VOLTAGE_330: + state =3D sdhst->pinctrl_default; + break; + case MMC_SIGNAL_VOLTAGE_180: + state =3D sdhst->pinctrl_uhs; + break; + default: + dev_warn(mmc_dev(host->mmc), "unsupported voltage %d\n", + ios->signal_voltage); + return; + } + + if (state) { + ret =3D pinctrl_select_state(sdhst->pinctrl, state); + if (ret) { + dev_warn(mmc_dev(host->mmc), + "failed to select pinctrl state: %d\n", ret); + return; + } + dev_dbg(mmc_dev(host->mmc), "switched to %s pinctrl state\n", + ios->signal_voltage =3D=3D MMC_SIGNAL_VOLTAGE_180 ? "UHS" : "default"); + } + } +} + static inline int spacemit_sdhci_get_clocks(struct device *dev, struct sdhci_pltfm_host *pltfm_host) { @@ -242,6 +282,7 @@ static const struct sdhci_ops spacemit_sdhci_ops =3D { .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 { @@ -293,6 +334,24 @@ static int spacemit_sdhci_probe(struct platform_device= *pdev) =20 host->mmc->caps |=3D MMC_CAP_NEED_RSP_BUSY; =20 + sdhst =3D sdhci_pltfm_priv(pltfm_host); + sdhst->pinctrl =3D devm_pinctrl_get(dev); + if (!IS_ERR(sdhst->pinctrl)) { + 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); + } else { + sdhst->pinctrl =3D NULL; + dev_dbg(dev, "pinctrl not available, voltage switching will work without= it\n"); + } + ret =3D spacemit_sdhci_get_clocks(dev, pltfm_host); if (ret) goto err_pltfm; --=20 2.53.0