diff options
author | Kyle Roeschley <kyle.roeschley@ni.com> | 2018-04-13 16:54:57 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-05-02 15:08:44 +0200 |
commit | 247cfe53557524a94dd1001d19e5aa50bd5aca81 (patch) | |
tree | 73c891362517c86cc25e5fc85b1ee48188a1a6aa /drivers/mmc/core/mmc.c | |
parent | 1d6efe08c80d84b1f39845707288ffd4df239c3b (diff) | |
download | linux-247cfe53557524a94dd1001d19e5aa50bd5aca81.tar.gz linux-247cfe53557524a94dd1001d19e5aa50bd5aca81.tar.bz2 linux-247cfe53557524a94dd1001d19e5aa50bd5aca81.zip |
mmc: core: Add capability to avoid 3.3V signaling
Some SD host controllers cannot handle extended use of 3.3V signaling.
To accommodate these controllers, add a capability that requires us to
negotiate the voltage down from 3.3V during card initialization.
Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Jennifer Dahm <jennifer.dahm@ni.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core/mmc.c')
-rw-r--r-- | drivers/mmc/core/mmc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 6f8ebd6caa4c..915b58f9bfc5 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1830,6 +1830,14 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, } } + if (host->caps2 & MMC_CAP2_AVOID_3_3V && + host->ios.signal_voltage == MMC_SIGNAL_VOLTAGE_330) { + pr_err("%s: Host failed to negotiate down from 3.3V\n", + mmc_hostname(host)); + err = -EINVAL; + goto free_card; + } + if (!oldcard) host->card = card; |