From: Kevin Liu <keyuan.liu@gmail.com>
To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu
Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com,
kliu5@marvell.com, Jialing Fu <jlfu@marvell.com>
Subject: [PATCH 3/6] mmc: sdhci: set regulator min/max voltage according to spec
Date: Wed, 19 Sep 2012 10:12:39 +0800 [thread overview]
Message-ID: <1348020762-12932-4-git-send-email-keyuan.liu@gmail.com> (raw)
In-Reply-To: <1348020762-12932-1-git-send-email-keyuan.liu@gmail.com>
From: Kevin Liu <kliu5@marvell.com>
Use voltage range as below rather than a specific value
3.3v: (3.2v, 3.4v)
3.0v: (2.9v, 3.1v)
1.8v: (1.65v, 1.95v)
Signed-off-by: Jialing Fu <jlfu@marvell.com>
Signed-off-by: Kevin Liu <kliu5@marvell.com>
---
drivers/mmc/host/sdhci.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 2f844e5..f50efa6 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1628,7 +1628,7 @@ static int sdhci_do_3_3v_signal_voltage_switch(struct sdhci_host *host,
sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
if (host->vqmmc) {
- ret = regulator_set_voltage(host->vqmmc, 3300000, 3300000);
+ ret = regulator_set_voltage(host->vqmmc, 3200000, 3400000);
if (ret) {
pr_warning("%s: Switching to 3.3V signalling voltage "
" failed\n", mmc_hostname(host->mmc));
@@ -1672,7 +1672,7 @@ static int sdhci_do_1_8v_signal_voltage_switch(struct sdhci_host *host,
*/
if (host->vqmmc)
ret = regulator_set_voltage(host->vqmmc,
- 1800000, 1800000);
+ 1650000, 1950000);
else
ret = 0;
@@ -2856,7 +2856,7 @@ int sdhci_add_host(struct sdhci_host *host)
pr_info("%s: no vqmmc regulator found\n", mmc_hostname(mmc));
host->vqmmc = NULL;
}
- else if (regulator_is_supported_voltage(host->vqmmc, 1800000, 1800000))
+ else if (regulator_is_supported_voltage(host->vqmmc, 1650000, 1950000))
regulator_enable(host->vqmmc);
else
caps[1] &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 |
@@ -2927,16 +2927,16 @@ int sdhci_add_host(struct sdhci_host *host)
#ifdef CONFIG_REGULATOR
if (host->vmmc) {
- ret = regulator_is_supported_voltage(host->vmmc, 3300000,
- 3300000);
+ ret = regulator_is_supported_voltage(host->vmmc, 3200000,
+ 3400000);
if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_330)))
caps[0] &= ~SDHCI_CAN_VDD_330;
- ret = regulator_is_supported_voltage(host->vmmc, 3000000,
- 3000000);
+ ret = regulator_is_supported_voltage(host->vmmc, 2900000,
+ 3100000);
if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_300)))
caps[0] &= ~SDHCI_CAN_VDD_300;
- ret = regulator_is_supported_voltage(host->vmmc, 1800000,
- 1800000);
+ ret = regulator_is_supported_voltage(host->vmmc, 1650000,
+ 1950000);
if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_180)))
caps[0] &= ~SDHCI_CAN_VDD_180;
}
--
1.7.0.4
next prev parent reply other threads:[~2012-09-19 2:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 2:12 [PATCH 0/6] mmc: sdhci: fixes and enhancements Kevin Liu
2012-09-19 2:12 ` [PATCH 1/6] mmc: sdhci-pxav3: fix build error Kevin Liu
2012-09-19 2:47 ` Chris Ball
2012-09-19 2:12 ` [PATCH 2/6] mmc: sdhci: fix transfer mode setting bug for cmds w/o data transfer Kevin Liu
2012-09-19 2:12 ` Kevin Liu [this message]
2012-09-19 2:12 ` [PATCH 4/6] mmc: sdhci: refine code for sd clock disable/enable in set ios Kevin Liu
2012-09-19 2:12 ` [PATCH 5/6] mmc: sdhci: keep the saved clock var up to date Kevin Liu
2012-09-19 2:12 ` [PATCH 6/6] mmc: sdhci: fix null return check of regulator_get Kevin Liu
2012-09-19 2:50 ` Chris Ball
2012-09-19 2:53 ` [PATCH 0/6] mmc: sdhci: fixes and enhancements Chris Ball
2012-09-19 7:52 ` Kevin Liu
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=1348020762-12932-4-git-send-email-keyuan.liu@gmail.com \
--to=keyuan.liu@gmail.com \
--cc=cjb@laptop.org \
--cc=cxie4@marvell.com \
--cc=hzhuang1@marvell.com \
--cc=jlfu@marvell.com \
--cc=kliu5@marvell.com \
--cc=linux-mmc@vger.kernel.org \
--cc=pierre@ossman.eu \
--cc=prakity@marvell.com \
/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