diff options
| author | gonzo <gonzo@FreeBSD.org> | 2013-01-21 23:24:16 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2013-01-21 23:24:16 +0000 |
| commit | 7e3a9b068afb89996bd0ac6e5516ff59616a2cb9 (patch) | |
| tree | 93361438fb6d0612522f7e35b272a1c8c1ad3d7c | |
| parent | f209d18eb0627c8b3a99d605fd87c5d147675e97 (diff) | |
| download | FreeBSD-src-7e3a9b068afb89996bd0ac6e5516ff59616a2cb9.zip FreeBSD-src-7e3a9b068afb89996bd0ac6e5516ff59616a2cb9.tar.gz | |
Fix highest voltage detection
Submitted by: Daisuke Aoyama <aoyama at peach.ne.jp>
Approved by: imp@
| -rw-r--r-- | sys/dev/mmc/mmc.c | 3 | ||||
| -rw-r--r-- | sys/dev/mmc/mmcreg.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c index 27447ad..e7f6648 100644 --- a/sys/dev/mmc/mmc.c +++ b/sys/dev/mmc/mmc.c @@ -353,7 +353,8 @@ mmc_highest_voltage(uint32_t ocr) { int i; - for (i = 30; i >= 0; i--) + for (i = MMC_OCR_MAX_VOLTAGE_SHIFT; + i >= MMC_OCR_MIN_VOLTAGE_SHIFT; i--) if (ocr & (1 << i)) return (i); return (-1); diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h index 3d2b569..f454ddb 100644 --- a/sys/dev/mmc/mmcreg.h +++ b/sys/dev/mmc/mmcreg.h @@ -353,6 +353,7 @@ struct mmc_request { #define MMC_OCR_VOLTAGE 0x3fffffffU /* Vdd Voltage mask */ #define MMC_OCR_LOW_VOLTAGE (1u << 7) /* Low Voltage Range -- tbd */ #define MMC_OCR_200_210 (1U << 8) /* Vdd voltage 2.00 ~ 2.10 */ +#define MMC_OCR_MIN_VOLTAGE_SHIFT 8 #define MMC_OCR_210_220 (1U << 9) /* Vdd voltage 2.10 ~ 2.20 */ #define MMC_OCR_220_230 (1U << 10) /* Vdd voltage 2.20 ~ 2.30 */ #define MMC_OCR_230_240 (1U << 11) /* Vdd voltage 2.30 ~ 2.40 */ @@ -368,6 +369,7 @@ struct mmc_request { #define MMC_OCR_330_340 (1U << 21) /* Vdd voltage 3.30 ~ 3.40 */ #define MMC_OCR_340_350 (1U << 22) /* Vdd voltage 3.40 ~ 3.50 */ #define MMC_OCR_350_360 (1U << 23) /* Vdd voltage 3.50 ~ 3.60 */ +#define MMC_OCR_MAX_VOLTAGE_SHIFT 23 #define MMC_OCR_CCS (1u << 30) /* Card Capacity status (SD vs SDHC) */ #define MMC_OCR_CARD_BUSY (1U << 31) /* Card Power up status */ |
