From nobody Thu Apr 2 07:36:35 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 E094C3AF64D for ; Mon, 30 Mar 2026 08:38:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774859911; cv=none; b=oitnEjZEIK3+hOhzn3AoNhwo6AthQgR4YwPGim7Jr0HqwxQccIlML73i+V8ZhsnPb310Xg/JxpRqX6dSjzSKQPnSnTkHtmi8IIMRNELAafkW3gbJvSkwbLOPuSWYEuQiIh31ysDPo7fR1KAeDREoV6089mxepU3Ugluqsd74zrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774859911; c=relaxed/simple; bh=IUPCWZ8hYMJ6U/wvZl7DQy7F8lp73m8qXu0Aa8Qt1UQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ofMqrWw7A8o9moO7Zjk9aDPJhQFKQG6bARCxs8N1YImoj2TNcMp3Jxj3ccxpDMghdTaxnPxyoM035zdOlsmfrb0fQhxMtuShvjf1Nx8zzInMgbGEx9NXTZ/YK5yp1sw0+bEkdNSWLRNJsbNp+LkYFduXL7E0uR+UTXfRzXR4BFc= 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=RVMesTol; arc=none smtp.client-ip=209.85.128.43 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="RVMesTol" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-486fd5360d4so55855395e9.1 for ; Mon, 30 Mar 2026 01:38:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774859908; x=1775464708; 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=RM2PI1Utklboaim1+XGDH9DAYZ4UPq5dLeIx/PUc2kA=; b=RVMesTol//rdrSpr+AjTy6kZUmDwTV9QZEGyN3L+PTAKfTOfUEWq+vup4Sh9HO+plo EGBlIiVmCJsv7k3kFFryXSFJr7hxZEaxmmLObfglf5FZvyatJ279wMXozDWNfZUTo+vs caKfFjqsQF8W6H/WpmkpEw7Y2O4upGlH5jBpPXEtbqmUMExZxNbuRJP6Q0slHwEHNctm uRhqqVHkiEQiPuH1mwfGaUuv1iiAylPUEyavT8Zg7/Krz7bazJbVTTIjjYi1IsJUxbeb UKvAcmBxdHL94RFpy9QtDd8+oHcN2bFTR2ZvvmL3CMViY5tJM2LRjJ+WGgTNtLj/z/7H X4lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774859908; x=1775464708; 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=RM2PI1Utklboaim1+XGDH9DAYZ4UPq5dLeIx/PUc2kA=; b=ZcrN7z1STQC9qaja72gURNc/Cq/IT1NHE4SaUQD3z2iofCXjtRYz0EB9MaZejU49MZ 7zDzP9m6psNJOWykeUh+yp5cbqsJQYNhLXDBLMI3DczLhsHR0XuKjvFTHzl69o6gx7lE r/3u0TtnMgJ9/3rYXyDiDNPppR02CJuiBb1GddkLl3GUiHQ6SSaJRFzicPNXiR6xZ45s eSEafqE/0pDFd+NVCOjR2Y1wM+xuHJsxvIl8ZoBcD41IJLVHIPfMZsSO5neliECrd+Hu I83jbS5FYjLf9uBo88aFvTGc3RSznvJqYWS7nIDsJuDJj6ILfLzSyAUOBKVvDD4ez5RB SDXw== X-Forwarded-Encrypted: i=1; AJvYcCUaZam2qcyjfIbmDqHprg6feDv0IVghd6rWenBCLEKTWJ2l1rd9wog5RRi1drwhs6NO/McCsAw3D5LPSQw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzr4tQ9pJhsew+9plSVRZWl8uQ12M5hQUzJHHFSnDz30PqmJEF8 b6bkMamJWoetV9NhTDYEoOMOtrEviuB+LRXD/PPSfyktiXBl5pPCpffB X-Gm-Gg: ATEYQzxvaS6YYwzH7+djWK1uNvobSAjS4RzRnzKpZDTcsoItijFbc7rsKrQwTE8svZ7 XjvHGxvGj02CEp54u4tXeBeJwDRlcUv/R5k+6wmLFM3ffGUW9PA1c8jaL4YKUOtROkgZGWRQw3I o+VXcPPYkfQD06QTK0DWjZDbMWPVRiGsqxmAOWhdENuMuQ6tVBb9AGFYCZxMqP7ELYHWilXemp3 FJJ56q3GUBzpPxsGKJx8ogdyDuaJQ4Yzr8iCWogNmj4tokXffyoAoKA7VGYcYrdXHR7xlpjf3ek YiPhhUu0jtvdxSrC65Lpfq2+FZWeTO5NDIDFFhH9y0m4AF2itULRGrs0QcdKdqc85QtRkxrPi+M ep+x0MlNcg5U+mvG8QoVTab/3+Om94MTgp9D4DhIHxoZIa7JtymKPtJ2NaGYA1UrMi7E5T/6wDE hys+WTVJt4eNJZ0kbBsBnOadJzL7jmCqp46PlV1A3tnna4isC8pQOuLLg9Nj5EkcHd X-Received: by 2002:a05:600c:83c4:b0:485:46fd:7887 with SMTP id 5b1f17b1804b1-48727d8816amr191754305e9.13.1774859908252; Mon, 30 Mar 2026 01:38:28 -0700 (PDT) Received: from ipedrosa-thinkpadx1carbongen12.rmtes.csb ([67.218.232.54]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4872712c236sm74063315e9.14.2026.03.30.01.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 01:38:27 -0700 (PDT) From: Iker Pedrosa Date: Mon, 30 Mar 2026 10:38:04 +0200 Subject: [PATCH v5 3/9] 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: <20260330-orangepi-sd-card-uhs-v5-3-bd853604322d@gmail.com> References: <20260330-orangepi-sd-card-uhs-v5-0-bd853604322d@gmail.com> In-Reply-To: <20260330-orangepi-sd-card-uhs-v5-0-bd853604322d@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 , Trevor Gamblin 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 Tested-by: Trevor Gamblin Acked-by: Adrian Hunter Signed-off-by: Iker Pedrosa Reviewed-by: Troy Mitchell --- drivers/mmc/host/sdhci-of-k1.c | 72 ++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 72 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-k1.c b/drivers/mmc/host/sdhci-of-k1.c index 0dd06fc19b8574ae1b00f7e5d09b7d4c87d06770..234e258af25996e7bbcd0b70366= c7480bf62bee7 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,46 @@ static void spacemit_sdhci_pre_hs400_to_hs200(struct m= mc_host *mmc) SPACEMIT_SDHC_PHY_CTRL_REG); } =20 +static int spacemit_sdhci_start_signal_voltage_switch(struct mmc_host *mmc, + struct mmc_ios *ios) +{ + struct sdhci_host *host =3D mmc_priv(mmc); + struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); + struct spacemit_sdhci_host *sdhst =3D sdhci_pltfm_priv(pltfm_host); + struct pinctrl_state *state; + int ret; + + ret =3D sdhci_start_signal_voltage_switch(mmc, ios); + if (ret) + return ret; + + if (!sdhst->pinctrl) + return 0; + + /* Select appropriate pinctrl state based on signal voltage */ + 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(mmc), "unsupported voltage %d\n", ios->signal_voltage); + return 0; + } + + ret =3D pinctrl_select_state(sdhst->pinctrl, state); + if (ret) { + dev_warn(mmc_dev(mmc), "failed to select pinctrl state: %d\n", ret); + return 0; + } + dev_dbg(mmc_dev(mmc), "switched to %s pinctrl state\n", + ios->signal_voltage =3D=3D MMC_SIGNAL_VOLTAGE_180 ? "UHS" : "default"); + + return 0; +} + static inline int spacemit_sdhci_get_clocks(struct device *dev, struct sdhci_pltfm_host *pltfm_host) { @@ -252,6 +296,30 @@ static inline int spacemit_sdhci_get_resets(struct dev= ice *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, @@ -324,6 +392,10 @@ 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); + + host->mmc_host_ops.start_signal_voltage_switch =3D spacemit_sdhci_start_s= ignal_voltage_switch; + ret =3D spacemit_sdhci_get_clocks(dev, pltfm_host); if (ret) goto err_pltfm; --=20 2.53.0