diff options
author | Philip Rakity <prakity@marvell.com> | 2012-06-28 06:49:27 +0200 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-07-22 21:25:44 +0200 |
commit | bd6a8c30faf19b4e7abace93fb89efd6d72607ec (patch) | |
tree | f527fbf080402c10f09076859156862fd49bf52a /include | |
parent | mmc: mxs-mmc: enable regulator for mmc slot (diff) | |
download | linux-bd6a8c30faf19b4e7abace93fb89efd6d72607ec.tar.xz linux-bd6a8c30faf19b4e7abace93fb89efd6d72607ec.zip |
mmc: sdhci: Allow caps[1] to be set via SDHCI_QUIRK_MISSING_CAPS
Currently only the capability_0 register can be set if
SDHCI_QUIRK_MISSING_CAPS is defined. This is a problem when
the capability_1 register also needs changing. Use the quirk
SDHCI_QUIRK_MISSING_CAPS to allow both registers to be set.
Redefining caps[1] is useful when the board design does not
support 1.8v vccq so UHS modes are not available. The code that
calls sdhci_add_host can then detect this condition and adjust
the caps so the UHS mode will not be attempted on UHS cards.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mmc/sdhci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index e9051e1cb1ce..d989b511c9ab 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -155,7 +155,8 @@ struct sdhci_host { struct timer_list timer; /* Timer for timeouts */ - unsigned int caps; /* Alternative capabilities */ + unsigned int caps; /* Alternative CAPABILITY_0 */ + unsigned int caps1; /* Alternative CAPABILITY_1 */ unsigned int ocr_avail_sdio; /* OCR bit masks */ unsigned int ocr_avail_sd; |