From: Jerome Brunet <jbrunet@baylibre.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Carlo Caione <carlo@caione.org>
Cc: Jerome Brunet <jbrunet@baylibre.com>,
linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 14/16] mmc: meson-gx: implement voltage switch callback
Date: Mon, 21 Aug 2017 18:02:59 +0200 [thread overview]
Message-ID: <20170821160301.21899-15-jbrunet@baylibre.com> (raw)
In-Reply-To: <20170821160301.21899-1-jbrunet@baylibre.com>
Implement voltage switch callback (shamelessly copied from sunxi mmc
driver). This allow, with the appropriate tuning function, to use
SD ultra high speed modes.
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/mmc/host/meson-gx-mmc.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index df1ac96bd0db..3167f561e1a6 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -1050,6 +1050,28 @@ static int meson_mmc_card_busy(struct mmc_host *mmc)
return !(FIELD_GET(STATUS_DATI, regval) & 0xf);
}
+static int meson_mmc_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+ /* vqmmc regulator is available */
+ if (!IS_ERR(mmc->supply.vqmmc)) {
+ /*
+ * The usual amlogic setup uses a GPIO to switch from one
+ * regulator to the other. While the voltage ramp up is
+ * pretty fast, care must be taken when switching from 3.3v
+ * to 1.8v. Please make sure the regulator framework is aware
+ * of your own regulator constraints
+ */
+ return mmc_regulator_set_vqmmc(mmc, ios);
+
+ }
+
+ /* no vqmmc regulator, assume fixed regulator at 3/3.3V */
+ if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330)
+ return 0;
+
+ return -EINVAL;
+}
+
static const struct mmc_host_ops meson_mmc_ops = {
.request = meson_mmc_request,
.set_ios = meson_mmc_set_ios,
@@ -1058,6 +1080,7 @@ static const struct mmc_host_ops meson_mmc_ops = {
.post_req = meson_mmc_post_req,
.execute_tuning = meson_mmc_execute_tuning,
.card_busy = meson_mmc_card_busy,
+ .start_signal_voltage_switch = meson_mmc_voltage_switch,
};
static int meson_mmc_probe(struct platform_device *pdev)
--
2.9.5
next prev parent reply other threads:[~2017-08-21 16:02 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 16:02 [PATCH v2 00/16] mmc: meson-gx: driver fixups and upgrades Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 01/16] mmc: meson-gx: fix mux mask definition Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 02/16] mmc: meson-gx: remove CLK_DIVIDER_ALLOW_ZERO clock flag Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 03/16] mmc: meson-gx: clean up some constants Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 04/16] mmc: meson-gx: use _irqsave variant of spinlock Jerome Brunet
2017-08-22 11:08 ` Ulf Hansson
2017-08-22 11:41 ` Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 05/16] mmc: meson-gx: cfg init overwrite values Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 06/16] mmc: meson-gx: rework set_ios function Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 07/16] mmc: meson-gx: rework clk_set function Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 08/16] mmc: meson-gx: rework clock init function Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 09/16] mmc: meson-gx: fix dual data rate mode frequencies Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 10/16] mmc: meson-gx: work around clk-stop issue Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 11/16] mmc: meson-gx: simplify interrupt handler Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 12/16] mmc: meson-gx: implement card_busy callback Jerome Brunet
2017-08-21 16:02 ` [PATCH v2 13/16] mmc: meson-gx: use CCF to handle the clock phases Jerome Brunet
2017-08-25 0:04 ` Kevin Hilman
2017-08-21 16:02 ` Jerome Brunet [this message]
2017-08-21 16:03 ` [PATCH v2 15/16] mmc: meson-gx: change default tx phase Jerome Brunet
2017-08-25 0:05 ` Kevin Hilman
2017-08-21 16:03 ` [PATCH v2 16/16] mmc: meson-gx: rework tuning function Jerome Brunet
2017-08-22 11:15 ` [PATCH v2 00/16] mmc: meson-gx: driver fixups and upgrades Ulf Hansson
2017-08-22 11:46 ` Jerome Brunet
2017-08-23 13:10 ` Ulf Hansson
2017-08-25 0:05 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170821160301.21899-15-jbrunet@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=carlo@caione.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox