From nobody Wed Apr 8 13:08:30 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 8418F3A5E9F for ; Tue, 7 Apr 2026 08:26:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775550369; cv=none; b=FDF93foQzeDH5s572/z76kKOJzH3eRa5ZiuBp/Dwtq+nGfOrW/U2Ulx63nDbsJSYcgva8WtvpTOY/jJ8ZfX019FwBms9ZaqeqEvK9ZDzRJ3h84Qwmp+A9HhytjAzKPUEwAwmBL3cQZ1i5kUsB0y6rd7hJIRzO3B0zZqpkf6hQ5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775550369; c=relaxed/simple; bh=nRShNwlonydI3xmzkTMo8kbMpMRZ4r+QQYByxQWL2C0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GxizQrnG/kuMT297skl3xukMWEZX0stUAD2cOTumrFxCL10cmz5jRQWJLzi6sY8QOqE0EPQVoJXBjy5dXzdwIFu3Maz52brMkhxRC97y3rq3gUR5JG49uynH2CY3u3cxkJHO/031NRUQa1iD2t3KTxYVJEVDCDJc5nnLLKEQ8vI= 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=FisXem+9; arc=none smtp.client-ip=209.85.221.48 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="FisXem+9" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-43cf8fe9c2aso2762630f8f.2 for ; Tue, 07 Apr 2026 01:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775550366; x=1776155166; 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=U+Em78pG4MczTisQO9YIrYNt9KPWDr1XLJMXM4SwDxc=; b=FisXem+9PrD0XNnljD8G7lgQjqAIMxB9oYK0JnmabQxuGIg0a7qakkRZlWBrGxk+Tr rHf5u/2yvCb4QJxxdf6MzY/RvvkE5xSU+da9VlIhzJmHoOFYT1lolkVg9UUGATIYwbEE I4kUU1X42+5a2yqAwGCi0UDse3cBUDNH1GIBwsJs+V0IkNXU1SYC8wK9qtjjnQI7HrSc 06RW12Yfrkkn+kVko8FdoCRkF1gYx5kvp4z0q2Rzt+gIZV8Z84iZoK+PjCWzbKlr4FXW 9TJEBzFlgFVWjRi5T0aAWWOS5lZzjNv57geITQCrwodqWomMj90/2iGhJrcZIaUQl2Rs ierA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775550366; x=1776155166; 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=U+Em78pG4MczTisQO9YIrYNt9KPWDr1XLJMXM4SwDxc=; b=eajT26ChFx2h7PMIOs6qpJB75+3rkgsQERpxhcrLiAPf9ZtRZEz8B5LQ8ewSlY0/G0 Mc9Q+3xlW4ifS2x0xwHQCIsu/mc4XqZNmIngPUjg0I2iTUZcXXsmoiVD8AJdDxsUBFIm apI18mI8Ovn28m5adqPm38NYt/Wkm5wYWseVRytEfoX2mjBlGuhvlVXLPUBJHdesIiii CnVux0CG/c3nuyjcBEobVtiTRiT8nrH/i8Ivk2h9jR/PA+qpDup5W+QrdZ3+M/fQeFxG yt8cphFO+GKaXJuBGzyXnATMSZEusgdPaK0uupjIB1SMZcBRtSVNUmbffc6MU1WPmBjh Xw1A== X-Forwarded-Encrypted: i=1; AJvYcCX8bNv2I5YTMjFWMGqMuuEti4lwYKXRNBU9h0W4CT5n/o0UZQzNg+DimMN5g6eLcGO6yldrMKOkm/XYLkY=@vger.kernel.org X-Gm-Message-State: AOJu0YzzNoNIVGTWs6trr+jJh3iXRPT8H2PucaomlhHbrs3OnCLw7Jet DVFhML5c/6nYg+bXnuYdpuiJjMopSDhcHCeOuihJAQZqbrqTD9/rJscz X-Gm-Gg: AeBDievjMjKDkZkJk1G8oTYaZtO6blwycrZK6uoPw2c3JlrFmeq+jL7D7U8aoE9gVX/ fQYbMpXcBRLQpbaSpIG+K8CTx9uX2CiCdWhT5oEw8YgTNtqCkXipL9iG4BnIBRm6GiAHy2nHWIA X+Gs3m/4n4MAlEctsN52Pvf16GlCT7m/KFgfeWc6bdG2IL0TsIjzP373z37WKGMKMaHTVqqg8dm kfdV0VbXXayzoD8rH+sqRzBrsAMj/QaeumOL81XiEjLk1c/liNA/vLiVFJjzOjAKklF9d7kXFJk NYFr1mnLW099e1TLh6iBlXdXAIbcj+ihBQVEQ+MV5LmxFDSXGWSjwYdNOOxsCpUtleEoPJVCQjD VKWNzEApw3SGE3ySHHCRsrWMiIz6/yCvCIzbqtN0I3OmRJoRxxEPVLTNSb3Z+6hjCPris9FeERA ma9RemT5VA/VAYEbdt8bddAb7Y1+DFGp59GjqzjRicicvPMgnorTbBaa80Tpbk4Kbb X-Received: by 2002:a5d:664e:0:b0:43d:4883:192b with SMTP id ffacd0b85a97d-43d48831945mr2963140f8f.41.1775550365599; Tue, 07 Apr 2026 01:26:05 -0700 (PDT) Received: from ipedrosa-thinkpadx1carbongen12.rmtes.csb ([67.218.239.37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e4d29bbsm48669958f8f.21.2026.04.07.01.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 01:26:05 -0700 (PDT) From: Iker Pedrosa Date: Tue, 07 Apr 2026 10:25:23 +0200 Subject: [PATCH v6 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: <20260407-orangepi-sd-card-uhs-v6-3-b5b8a1b2bfc8@gmail.com> References: <20260407-orangepi-sd-card-uhs-v6-0-b5b8a1b2bfc8@gmail.com> In-Reply-To: <20260407-orangepi-sd-card-uhs-v6-0-b5b8a1b2bfc8@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: Troy Mitchell , 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 Reviewed-by: Troy Mitchell Signed-off-by: Iker Pedrosa --- 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..d9144537032a51a12d7480885f2= 47f4c66583e59 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, "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