From nobody Fri Apr 3 22:13:49 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 242E638BF81 for ; Mon, 23 Mar 2026 10:19:34 +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=1774261175; cv=none; b=kNcRPXSozljuMMoGxvsqycB8PLDm+J5Z0+PiYjCW0TceL7RpzP+GX4lMv6xKHmOn5fM71SkuDwrdnR04JDoxembgO6Cvov84XlYG7hZJjPD1W8Vj6VZ+TVUn/Y8dmoGCramN/oPD/PHgyxz2H9FJNZa+jkKShDxAVcthEVaSHLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774261175; c=relaxed/simple; bh=r8frD7Ih7/6TDrK7WkKP2nnBDnfc3SHl7IYdzA+pE1w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bCR8f8Ud8ohu74SoK9L0hIS187ojenD0fHS2hmXq6nuz1aG2EBTNoQTk292nAUpp+fqsR/utJOSOyDCi69r7NgLrDybhUqYgRfu/MDCB8n0Xv0UnB20c2CTIzo7czacHvmIIoRrrrT1zAnl/NwePWoUKhnfvNt/MZ/nfw26WIEw= 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=b8xkB6y9; 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="b8xkB6y9" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-486fe2024a9so19250675e9.0 for ; Mon, 23 Mar 2026 03:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774261173; x=1774865973; 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=2BsT6JJye2hc6dEStRqlQwTUPLoIQwEfV/djOfhm19A=; b=b8xkB6y9xKEIgmZumX7oJkEl0zq1joKr7ab0pGkita9+K8T0T9oRBiAP16GjU1uCKK 4EzyoBMKY8PC950CsjqMuK3qSsnufayVqQtgmuRNNIEe2vsr24ZTqnIF0xShj5xqkv1w jmfXhfXVGAOQmmLRs37cq1K6dcPO533v7t14yiAN1Z2vARXbKup8/pIT5ggYSTgJM4RW ExpvtNkEMNwBzDhpZCD3D5Q4CtMUWInjdN2mjH730dYix2EWgCSMcN/8Riaz8JcYvQFB iZBxQEuRo/QABInucrmbitu7DvtRWLM4Wdr9NEKjs1F33fD7nwPiltV/Zsqkp1JlDXIs w8aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774261173; x=1774865973; 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=2BsT6JJye2hc6dEStRqlQwTUPLoIQwEfV/djOfhm19A=; b=THwL58IOgMJetM5F7Ln4j87EjmQDEr3ScASY98I4mD+FJGtykL7IezBB8N1hV9Rht/ 2P/ObPJYvw6V++rTqzilxlEZpVbd3/1dMIBe6DabcycudJfVy3nFOfhMawFoM1ui3neS iiXqS/Z36beqPCV2j5FJCIBrBvKP1vcF5f0DgL45dCEyIRcxlMvhgtZCGXJIDW2MC4DT hrhHwHPy9HXkUkF6Wzv/jnwpIX1Ku88+4Uppy2lUOaa84lD61KNG7Kj4yZBmnjfq+QKp u2Kq26hlVG+WPcNjlQQGlO6L7138jpHj9qLo7CuPZZK545Lthi9pCLhl/exw9ZxrPT/G STPQ== X-Forwarded-Encrypted: i=1; AJvYcCWsziB9auMWCo9o+WNIxXT6ply1BlAQedJFQoAPk6zA0ZDhf+ueKYC2VZb6an0igf6Z09bAkxov4RWShTM=@vger.kernel.org X-Gm-Message-State: AOJu0YybaUTBrvw5Bm1Mf9QiZ+wdm8B0WQkwYKjqxcQK9UH0C7w9cMci NT7fG7s3G1IDJYJVsu8+I26Zc4I00aLOI5z1Sd/pmZLNWj+60p8RH4Rr X-Gm-Gg: ATEYQzy6KcVftjOyEkpqYSJ2hK/aqE7f0CSMYYdWapTzW/x26X6dsp/7d1C952opm2m vmh5SuOeDj4wv2BHjXb+G0cd9mS5iHFkvHjjlbkgZuWYwvw7z5WofMXo17nHPpsrmEOZCo5tl96 tO1ZsH8V6vj+d/pzNTnjCSXbpvfuHDXSk2MkMgOngDiXv48ze99SjokBchwyJ+gHHaSsEzkpYQ4 xu/+rBGOP59MkPfGfYjuIedSMpbOopUYNr4veHDj+8JgNBt6PYqAX5m0wQ07JUruZE05h41Uqhs 2bfwsr2qUwd290EICFCD7yRTfDcpiH0TyT1Yjit3BMHwdtlG5Q4xWB59SjeVcAUgm3TXAGkEN1c F2vTVsbJblxnxwrmUav09RceOL+x9nkR4R5IVDGysx64G9C+n7vlNlY/Lziiswaqtw0jjgYJ96w MKO8/gauz/Ro1pWtSadIAE6DZUXl67sb8N0+LGXlWxeoOFpcUD6Sy4tZGuHhb2Xutt X-Received: by 2002:a05:600c:45c5:b0:485:3b34:2f51 with SMTP id 5b1f17b1804b1-486febbc66bmr166065695e9.4.1774261172487; Mon, 23 Mar 2026 03:19:32 -0700 (PDT) Received: from ipedrosa-thinkpadx1carbongen12.rmtes.csb ([67.218.232.54]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe86acb0sm78755445e9.6.2026.03.23.03.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 03:19:32 -0700 (PDT) From: Iker Pedrosa Date: Mon, 23 Mar 2026 11:19:05 +0100 Subject: [PATCH v4 2/8] 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: <20260323-orangepi-sd-card-uhs-v4-2-567c9775fd0e@gmail.com> References: <20260323-orangepi-sd-card-uhs-v4-0-567c9775fd0e@gmail.com> In-Reply-To: <20260323-orangepi-sd-card-uhs-v4-0-567c9775fd0e@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 Signed-off-by: Iker Pedrosa Acked-by: Adrian Hunter --- 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