From patchwork Mon Oct 17 09:11:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Shih X-Patchwork-Id: 3300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1346917wrs; Mon, 17 Oct 2022 02:16:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM68yQB2fd8PCaYWOqAPf3bUD+WY9I1DqCfIrj+8MpJ5mjU5YeTeMg1wR/Cn3rcMVraR2Phw X-Received: by 2002:a17:90a:4607:b0:202:d8b7:2c1b with SMTP id w7-20020a17090a460700b00202d8b72c1bmr12650933pjg.64.1665998172489; Mon, 17 Oct 2022 02:16:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665998172; cv=none; d=google.com; s=arc-20160816; b=AeQ54kavU3N0ZezK3PtMgaH/bCW0ulEGkoKKwLiyhrjcD8EQrSERd1KyP3EDdlpoXD R0K1imVOmq56LeMl1BSAKBAq1bgpYB5ECxKZvrFfi1e60b9pLv7q3IIFaoRsz5IYfZev NsQAKsdzoQdcW9H40hM3J3HvA21auLDeqGzloInIEjdKUKXvMdD814LmgoUyo/LSdtaI EhG3+AaTlBQvcWLfZDanFBx0Le06P0VIsJ02i7I6ISTB+yhKBtqqx34FPmz1Nfpq1V7O i8fk6V3//jT7wI2aN1Uf6Pq04ApnYRJ+feGoFaU67MH10fxkoXdf7fs/b50kw5++XyUq Hk9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CCH8Igg1orUCvBJ3wNzvtOpE3BVsidt9yGsLk/7NTnE=; b=ZOtYIJIwqfnV8SsSKFi96H6n0xGsesGREIOpLNWbOdg1ygBOWBjYQ9FhuSJhsDsCQ3 6QUPDmCbrzkl8CJ3LONJeotLgvDuScqN0+zu5othIT6l9OmqvlLb6ZMFRLJ3qL4HLaLs g4zrsN8Sadf4gT/hAg+eSRyoVP5gJTUJWZ4Rdz33zkH/ssKt7JNdo94sCdiKZwAVqulu vyAxquwi1nz6jsH3dvsjFm1yHHnWDong0AuGw/Y8KhP0drDB0lC2WTqJyw2kxwReLJ3a +CnnqSG5NdQ+80PtdIXcbKjJtLoXSPYbxRU3eae3cskASnBhR1ymLwloXhk49n5xGz3r WbJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qKs8qLtj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s1-20020aa78bc1000000b005355298e9c3si10512118pfd.228.2022.10.17.02.15.57; Mon, 17 Oct 2022 02:16:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qKs8qLtj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230527AbiJQJMz (ORCPT + 99 others); Mon, 17 Oct 2022 05:12:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230520AbiJQJM1 (ORCPT ); Mon, 17 Oct 2022 05:12:27 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18C0F17060; Mon, 17 Oct 2022 02:12:22 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id o17-20020a17090aac1100b0020d98b0c0f4so12261380pjq.4; Mon, 17 Oct 2022 02:12:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=CCH8Igg1orUCvBJ3wNzvtOpE3BVsidt9yGsLk/7NTnE=; b=qKs8qLtjtotgNP9MVQTnrpi278faVxNJT5w8LPgm8GH2aLKvN0QJaAu1N2Mf1TVdJz s4pC8BMg3FT3R+fr4V74khHjDnj+SCu5jBWfCd0h9kMjEesMdJlSfRGYR3+rQ7d9JFlp iSP/kw1PN5OWWlcGKmpTKKPMUv3kM5K52DNTJwt8EuCOhLzOAGzCRbxWZ9amAePzsbIh fVKsP6GKfcZ0tA3jYCQpqtFmminKCnsTmifeQAJALah/WNHHSPVmkVJNeoEcyoT2FxWp LxSZyAYB1Ve+l8ONKa4GnAA3t75pL8EkiXeSKjILL0SdeC5cE99NQi5Z8myl8lS4yIqp dIQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CCH8Igg1orUCvBJ3wNzvtOpE3BVsidt9yGsLk/7NTnE=; b=iEKOuSeM9B2MN1cBoukpZwtejWrUw928Mg23a3Wh3jkUHOoMuhL0CUYgKjweZivYW8 jM2T+OQCTKCBluE6Xefebd2Z1ghyu35pSUnwygMD5lFwmjbUgavyN7aRxJY6MhLtZgBF 877rGId6vGL9g6KsW9WJ+qKWJIpT2EEQKu2Ul+Fc5w5eidpj4/EZGzP11cHnVgOj25Fe oYo9DZXh+eAQ62SyPjQg8NWF6aFAhY6Xdq8LSaSw6EsqU1+afW6ie7ih2e0KVGXyJMs1 yKzfY6BcWWPYrQ9K2DsS6/yk8CWIZo3xbBGcQw8QuqyQzCf1ot3a/jfdimY0nJ/MZWdW MThg== X-Gm-Message-State: ACrzQf2ElQ+xE+0qnZbpXtYFkQ9id/gY1s+2NAfKZhmHo1XJ2Ywqhv3H laf+aBMG/d8VswbOuc0GHhg= X-Received: by 2002:a17:90b:3ecc:b0:20d:9da6:56cd with SMTP id rm12-20020a17090b3ecc00b0020d9da656cdmr12233695pjb.246.1665997941902; Mon, 17 Oct 2022 02:12:21 -0700 (PDT) Received: from localhost.localdomain (2001-b400-e258-8c34-4ca3-4989-34c1-7890.emome-ip6.hinet.net. [2001:b400:e258:8c34:4ca3:4989:34c1:7890]) by smtp.gmail.com with ESMTPSA id t22-20020a170902b21600b0017f75bc7a61sm6091996plr.166.2022.10.17.02.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 02:12:21 -0700 (PDT) From: Victor Shih X-Google-Original-From: Victor Shih To: ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, benchuanggli@gmail.com, HL.Liu@genesyslogic.com.tw, Greg.tu@genesyslogic.com.tw, takahiro.akashi@linaro.org, dlunev@chromium.org, Victor Shih Subject: [PATCH V5 04/26] mmc: core: Extend support for mmc regulators with a vqmmc2 Date: Mon, 17 Oct 2022 17:11:31 +0800 Message-Id: <20221017091153.454873-5-victor.shih@genesyslogic.com.tw> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221017091153.454873-1-victor.shih@genesyslogic.com.tw> References: <20221017091153.454873-1-victor.shih@genesyslogic.com.tw> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746925699850441076?= X-GMAIL-MSGID: =?utf-8?q?1746925699850441076?= From: Ulf Hansson Updates in V4: - Moved the voltage defines into this patch. Update in previous version: To allow an additional external regulator to be controlled by an mmc host driver, let's add support for a vqmmc2 regulator to the mmc core. For an SD UHS-II interface the vqmmc2 regulator may correspond to the so called vdd2 supply, as described by the SD spec. Initially, only 1.8V is needed, hence limit the new helper function, mmc_regulator_set_vqmmc2() to this too. Note that, to allow for flexibility mmc host drivers need to manage the enable/disable of the vqmmc2 regulator themselves, while the regulator is looked up through the common mmc_regulator_get_supply(). Signed-off-by: Ulf Hansson --- drivers/mmc/core/regulator.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/mmc/host.h | 11 +++++++++++ 2 files changed, 45 insertions(+) diff --git a/drivers/mmc/core/regulator.c b/drivers/mmc/core/regulator.c index 609201a467ef..3c189682797c 100644 --- a/drivers/mmc/core/regulator.c +++ b/drivers/mmc/core/regulator.c @@ -223,6 +223,33 @@ int mmc_regulator_set_vqmmc(struct mmc_host *mmc, struct mmc_ios *ios) } EXPORT_SYMBOL_GPL(mmc_regulator_set_vqmmc); +/** + * mmc_regulator_set_vqmmc2 - Set vqmmc2 as per the ios->vqmmc2_voltage + * @mmc: The mmc host to regulate + * @ios: The io bus settings + * + * Sets a new voltage level for the vqmmc2 regulator, which may correspond to + * the vdd2 regulator for an SD UHS-II interface. This function is expected to + * be called by mmc host drivers. + * + * Returns a negative error code on failure, zero if the voltage level was + * changed successfully or a positive value if the level didn't need to change. + */ +int mmc_regulator_set_vqmmc2(struct mmc_host *mmc, struct mmc_ios *ios) +{ + if (IS_ERR(mmc->supply.vqmmc2)) + return -EINVAL; + + switch (ios->vqmmc2_voltage) { + case MMC_VQMMC2_VOLTAGE_180: + return mmc_regulator_set_voltage_if_supported( + mmc->supply.vqmmc2, 1700000, 1800000, 1950000); + default: + return -EINVAL; + } +} +EXPORT_SYMBOL_GPL(mmc_regulator_set_vqmmc2); + #else static inline int mmc_regulator_get_ocrmask(struct regulator *supply) @@ -249,6 +276,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) mmc->supply.vmmc = devm_regulator_get_optional(dev, "vmmc"); mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc"); + mmc->supply.vqmmc2 = devm_regulator_get_optional(dev, "vqmmc2"); if (IS_ERR(mmc->supply.vmmc)) { if (PTR_ERR(mmc->supply.vmmc) == -EPROBE_DEFER) @@ -268,6 +296,12 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) dev_dbg(dev, "No vqmmc regulator found\n"); } + if (IS_ERR(mmc->supply.vqmmc2)) { + if (PTR_ERR(mmc->supply.vqmmc2) == -EPROBE_DEFER) + return -EPROBE_DEFER; + dev_dbg(dev, "No vqmmc2 regulator found\n"); + } + return 0; } EXPORT_SYMBOL_GPL(mmc_regulator_get_supply); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 0b4122b26352..cc2cd502ae29 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -71,6 +71,9 @@ struct mmc_ios { #define MMC_SIGNAL_VOLTAGE_180 1 #define MMC_SIGNAL_VOLTAGE_120 2 + unsigned char vqmmc2_voltage; +#define MMC_VQMMC2_VOLTAGE_180 0 + unsigned char drv_type; /* driver type (A, B, C, D) */ #define MMC_SET_DRIVER_TYPE_B 0 @@ -321,6 +324,7 @@ struct mmc_pwrseq; struct mmc_supply { struct regulator *vmmc; /* Card power supply */ struct regulator *vqmmc; /* Optional Vccq supply */ + struct regulator *vqmmc2; /* Optional supply for phy */ }; struct mmc_ctx { @@ -600,6 +604,7 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc, struct regulator *supply, unsigned short vdd_bit); int mmc_regulator_set_vqmmc(struct mmc_host *mmc, struct mmc_ios *ios); +int mmc_regulator_set_vqmmc2(struct mmc_host *mmc, struct mmc_ios *ios); #else static inline int mmc_regulator_set_ocr(struct mmc_host *mmc, struct regulator *supply, @@ -613,6 +618,12 @@ static inline int mmc_regulator_set_vqmmc(struct mmc_host *mmc, { return -EINVAL; } + +static inline int mmc_regulator_set_vqmmc2(struct mmc_host *mmc, + struct mmc_ios *ios) +{ + return -EINVAL; +} #endif int mmc_regulator_get_supply(struct mmc_host *mmc);