From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 6A8AB392C46 for ; Mon, 13 Apr 2026 07:26:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776065169; cv=none; b=uEyxwaRDQ5AWWuQ8UtvlH+xWjO5WJRaKskd6HGe95M/nPhdx7KVPQYvY6vi3/QMEmykEQqY3+ujaxIVXB5mzEnW+gcRzOcH36jpYjL6h7UeBo4O8zz7QToCALNH2evdLSWQdsiZh929iLjobpnXpBdkI1TvBulrVnms+H7RV65Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776065169; c=relaxed/simple; bh=lQe/1C1yUclvn5uXddSpw2OgIhgzl5fVc6scliCgVzI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q09teIySzJ25LV27go2Tks4lPXRtEin3DQD6+27ociRH5vLpchbqusD2T3HcxQx4vyS38Gp1t1GYZqyKAezw/T4LMxs4N/4FgW+06FlHLAzJqIsM8E1+3CkHwQ6/fqTJWy4Hc24o6ALEWh3ZIQbLx9pRwIBHtmZhGjjAefeALdY= 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=kaAFFG85; arc=none smtp.client-ip=209.85.128.51 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="kaAFFG85" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-482f454be5bso43137885e9.0 for ; Mon, 13 Apr 2026 00:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776065167; x=1776669967; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/k4mLTIsc5RI8xaNMKymA8VHdibedwqV8+ItxZpomdA=; b=kaAFFG857ayf4pHZykk+D2D0Hpx03GQ3dcSt9jRIoKRjdXYMRvHg1DMQqsNry5qTGE /uDLLzykpnQAU46l96VTNyE09xKy2fYk7zuB4n1In7jzaJ32Qf4FD4Y2ojnkmTyurX+4 epe7AujQ798y3idfsALrEV1y0NzfCJt9f/vNglDLFilgbCNWaxGf8jCBz/G7AbC/CikJ u+3k59t3pf++IgQb7kQRXX7/ILbyltvOGae6uTYer5oFZAc6rLaTNrIOfXp0KA1NSFi8 mdbHDomcGrwWKy0v685FEHBa/BKULeCGfQP+Xqt3igtHHmBjkNPAqoe7ZifLEuGHzcaI OZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776065167; x=1776669967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/k4mLTIsc5RI8xaNMKymA8VHdibedwqV8+ItxZpomdA=; b=lrc2MfGyRzhuBl+ycUTiqWJynGf9ybvue6UZzxygsqGBg627otqGL6nhFulbOv00vp Ntv8QVBOqtNGpMx30CN8JQ4tXX0/cROhmykGtiXsbVwos+WkHhQva8GH3wTZrNE/sYEX il6SyUmkD8yYi77VMeTwgOEe7zqlnbk962Hb3wUwngI+9koq+ygG8zYWXxE8NYNnAXyV CM+PFCJHYel6NfL8mNpY84FsGq2GAeMYfIdyStqZ5/D/qwejE3GTEv75tYf/g9SrnMrt 83YlvURMWlHYyLUmyvpWRSrJjFtSsGUMPDtd/aJdODg3hU5Wv4WkKGY2HOSK1ZkDBjGg ezKQ== X-Forwarded-Encrypted: i=1; AFNElJ8hEIA9BQ8KFdNxhxbU4uirCBNZcP8cYZPc2Rh6EX0gS9P2TEcjRyC+/vv6MGH2jKWbpcGZufQYit9nZ2E=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7e9W1ZCZpOD0KyEdpMErngEqiK9X5uNdDAGrHBPuMrCJAcqcw zOstf4XpWuQwhS2vp6FxqLRdCmNnj6UvltVEamm7Pgd/E4Zwh9VaIjn/ X-Gm-Gg: AeBDieu4oJ3cKVclH9y9uUSGL91D1OgLvMfjKJEWJcliYXvtDQJIjWglYePRkIutHsK kF5W9/TGpne4W7C+vo4uaYUtjtXM/6Tt84qzHyGGkFIIV/Zjb8D8I1uGDdYeRF6NNzHcGmgyG46 fR0nUbRUNnOBS5woyduXFSu+XIaNUmSiaOjF5i1fwZXr1HQ/ntc9ZlpYA6+hMnILqc3uucbJDnj Tpu/3FBuC3It59NFSH4aCkw7LhFmudJyNQSMw0cqICDnYY5u/aubvESejWxY64xkXpiuscWIkhy ERHSokg7vHaAp75DCd73J+iW8E1Knf3tJbPLwnHLu21moHa/VT4mPPvFlNBpx1E3ZFsfjGvQPco Epo6ODNKauvTbpVyAKG7bNN1TP6dB3G4/mGGt/bHAzugpSZCC/WUtNsq7n/WxasiBQozI9spaEv nyL9Jtl7/bO940RhVXpXVgf5P8LRV1m7Yv+A4UuMC2nysXL5TmJUN0BvavOvaIODdE6lKMftpHW EY= X-Received: by 2002:a05:600c:8717:b0:477:9890:9ab8 with SMTP id 5b1f17b1804b1-488d6816f5amr164955675e9.3.1776065166673; Mon, 13 Apr 2026 00:26:06 -0700 (PDT) Received: from ipedrosa-thinkpadx1carbongen12.rmtes.csb ([67.218.239.37]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488df2a1237sm322180555e9.6.2026.04.13.00.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 00:26:06 -0700 (PDT) From: Iker Pedrosa To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Adrian Hunter , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Yixun Lan Cc: Iker Pedrosa , 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, Anand Moon , Trevor Gamblin , Vincent Legoll Subject: [PATCH v7 3/9] mmc: sdhci-of-k1: add regulator and pinctrl voltage switching support Date: Mon, 13 Apr 2026 09:24:45 +0200 Message-ID: <20260413-orangepi-sd-card-uhs-v7-3-16650f49c022@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413-orangepi-sd-card-uhs-v7-0-16650f49c022@gmail.com> References: <20260413-orangepi-sd-card-uhs-v7-0-16650f49c022@gmail.com> 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" X-Mailer: b4 0.14.3 Content-Transfer-Encoding: 8bit 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 Tested-by: Vincent Legoll 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 0dd06fc19b85..d9144537032a 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 #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; }; /* All helper functions will update clr/set while preserve rest bits */ @@ -219,6 +223,46 @@ static void spacemit_sdhci_pre_hs400_to_hs200(struct mmc_host *mmc) SPACEMIT_SDHC_PHY_CTRL_REG); } +static int spacemit_sdhci_start_signal_voltage_switch(struct mmc_host *mmc, + struct mmc_ios *ios) +{ + struct sdhci_host *host = mmc_priv(mmc); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct spacemit_sdhci_host *sdhst = sdhci_pltfm_priv(pltfm_host); + struct pinctrl_state *state; + int ret; + + ret = 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 = sdhst->pinctrl_default; + break; + case MMC_SIGNAL_VOLTAGE_180: + state = sdhst->pinctrl_uhs; + break; + default: + dev_warn(mmc_dev(mmc), "unsupported voltage %d\n", ios->signal_voltage); + return 0; + } + + ret = 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 == 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 device *dev) return 0; } +static inline void spacemit_sdhci_get_pins(struct device *dev, + struct sdhci_pltfm_host *pltfm_host) +{ + struct spacemit_sdhci_host *sdhst = sdhci_pltfm_priv(pltfm_host); + + sdhst->pinctrl = devm_pinctrl_get(dev); + if (IS_ERR(sdhst->pinctrl)) { + sdhst->pinctrl = NULL; + dev_dbg(dev, "pinctrl not available, voltage switching will work without it\n"); + return; + } + + sdhst->pinctrl_default = pinctrl_lookup_state(sdhst->pinctrl, "default"); + if (IS_ERR(sdhst->pinctrl_default)) + sdhst->pinctrl_default = NULL; + + sdhst->pinctrl_uhs = pinctrl_lookup_state(sdhst->pinctrl, "uhs"); + if (IS_ERR(sdhst->pinctrl_uhs)) + sdhst->pinctrl_uhs = NULL; + + dev_dbg(dev, "pinctrl setup: default=%p, uhs=%p\n", + sdhst->pinctrl_default, sdhst->pinctrl_uhs); +} + static const struct sdhci_ops spacemit_sdhci_ops = { .get_max_clock = spacemit_sdhci_clk_get_max_clock, .reset = spacemit_sdhci_reset, @@ -324,6 +392,10 @@ static int spacemit_sdhci_probe(struct platform_device *pdev) host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY; + spacemit_sdhci_get_pins(dev, pltfm_host); + + host->mmc_host_ops.start_signal_voltage_switch = spacemit_sdhci_start_signal_voltage_switch; + ret = spacemit_sdhci_get_clocks(dev, pltfm_host); if (ret) goto err_pltfm; -- 2.53.0