From: heiko@sntech.de (Heiko Stuebner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/8] mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch
Date: Mon, 31 Aug 2015 20:24:02 +0200 [thread overview]
Message-ID: <1441045446-30858-5-git-send-email-heiko@sntech.de> (raw)
In-Reply-To: <1441045446-30858-1-git-send-email-heiko@sntech.de>
From: Douglas Anderson <dianders@chromium.org>
We've introduced a new helper in the MMC core:
mmc_regulator_set_vqmmc(). Let's use this in dw_mmc. Using this new
helper has some advantages:
1. We get the mmc_regulator_set_vqmmc() behavior of trying to match
VQMMC and VMMC when the signal voltage is 3.3V. This ensures max
compatibility.
2. We get rid of a few more warnings when probing unsupported
voltages.
3. We get rid of some non-dw_mmc specific code in dw_mmc.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/mmc/host/dw_mmc.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index fcbf552..b1b7e7f 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1279,7 +1279,6 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
const struct dw_mci_drv_data *drv_data = host->drv_data;
u32 uhs;
u32 v18 = SDMMC_UHS_18V << slot->id;
- int min_uv, max_uv;
int ret;
if (drv_data && drv_data->switch_voltage)
@@ -1291,22 +1290,18 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
* does no harm but you need to set the regulator directly. Try both.
*/
uhs = mci_readl(host, UHS_REG);
- if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) {
- min_uv = 2700000;
- max_uv = 3600000;
+ if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330)
uhs &= ~v18;
- } else {
- min_uv = 1700000;
- max_uv = 1950000;
+ else
uhs |= v18;
- }
+
if (!IS_ERR(mmc->supply.vqmmc)) {
- ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv);
+ ret = mmc_regulator_set_vqmmc(mmc, ios);
if (ret) {
dev_dbg(&mmc->class_dev,
- "Regulator set error %d: %d - %d\n",
- ret, min_uv, max_uv);
+ "Regulator set error %d - %s V\n",
+ ret, uhs & v18 ? "1.8" : "3.3");
return ret;
}
}
--
2.1.4
next prev parent reply other threads:[~2015-08-31 18:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-31 18:23 [PATCH 0/8] mmc: dw_mmc: allow tuning using the clk-phase api Heiko Stuebner
2015-08-31 18:23 ` [PATCH 1/8] clk: rockchip: Allow more precision for some mmc clock phases Heiko Stuebner
2015-08-31 18:24 ` [PATCH 2/8] clk: rockchip: Make calculations use rounding Heiko Stuebner
2015-08-31 18:24 ` [PATCH 3/8] mmc: core: Add mmc_regulator_set_vqmmc() Heiko Stuebner
2015-09-02 11:38 ` Ulf Hansson
2015-09-02 16:20 ` Doug Anderson
2015-09-10 12:40 ` Ulf Hansson
2015-08-31 18:24 ` Heiko Stuebner [this message]
2015-08-31 18:24 ` [PATCH 5/8] mmc: dw_mmc: dt-binding: Add tuning related things Heiko Stuebner
2015-09-02 5:01 ` Jaehoon Chung
2015-09-02 7:41 ` Heiko Stuebner
2015-08-31 18:24 ` [PATCH 6/8] mmc: dw_mmc: Generic MMC tuning with the clock phase framework Heiko Stuebner
2015-09-15 8:25 ` Jaehoon Chung
2015-09-15 22:09 ` Heiko Stübner
2015-09-16 2:30 ` Jaehoon Chung
2015-09-16 14:52 ` Heiko Stübner
2015-09-17 2:03 ` Jaehoon Chung
2015-08-31 18:24 ` [PATCH 7/8] ARM: dts: rockchip: Add drive/sample clocks for rk3288 dw_mmc devices Heiko Stuebner
2015-08-31 18:24 ` [PATCH 8/8] ARM: dts: rockchip: add tuning related settings to veyron devices Heiko Stuebner
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=1441045446-30858-5-git-send-email-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).