Module Name: src
Committed By: nonaka
Date: Wed Aug 10 04:24:17 UTC 2016
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdmmcreg.h
Log Message:
Use 1.65-1.95 voltage window for 1.8V support.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/sdmmc/sdmmcreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.94 src/sys/dev/sdmmc/sdhc.c:1.95
--- src/sys/dev/sdmmc/sdhc.c:1.94 Sun Jul 3 11:55:27 2016
+++ src/sys/dev/sdmmc/sdhc.c Wed Aug 10 04:24:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.94 2016/07/03 11:55:27 kiyohara Exp $ */
+/* $NetBSD: sdhc.c,v 1.95 2016/08/10 04:24:17 nonaka Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.94 2016/07/03 11:55:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.95 2016/08/10 04:24:17 nonaka Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -484,7 +484,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
aprint_normal(" SDR104 HS200");
}
if (ISSET(caps, SDHC_VOLTAGE_SUPP_1_8V)) {
- SET(hp->ocr, MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V);
+ SET(hp->ocr, MMC_OCR_1_65V_1_95V);
aprint_normal(" 1.8V");
}
if (ISSET(caps, SDHC_VOLTAGE_SUPP_3_0V)) {
@@ -910,7 +910,7 @@ sdhc_bus_power(sdmmc_chipset_handle_t sc
* Select the lowest voltage according to capabilities.
*/
ocr &= hp->ocr;
- if (ISSET(ocr, MMC_OCR_1_7V_1_8V|MMC_OCR_1_8V_1_9V)) {
+ if (ISSET(ocr, MMC_OCR_1_65V_1_95V)) {
vdd = SDHC_VOLTAGE_1_8V;
} else if (ISSET(ocr, MMC_OCR_2_9V_3_0V|MMC_OCR_3_0V_3_1V)) {
vdd = SDHC_VOLTAGE_3_0V;
Index: src/sys/dev/sdmmc/sdmmcreg.h
diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.21 src/sys/dev/sdmmc/sdmmcreg.h:1.22
--- src/sys/dev/sdmmc/sdmmcreg.h:1.21 Thu Oct 29 22:37:15 2015
+++ src/sys/dev/sdmmc/sdmmcreg.h Wed Aug 10 04:24:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmcreg.h,v 1.21 2015/10/29 22:37:15 jmcneill Exp $ */
+/* $NetBSD: sdmmcreg.h,v 1.22 2016/08/10 04:24:17 nonaka Exp $ */
/* $OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -91,10 +91,7 @@
#define MMC_OCR_2_2V_2_3V (1<<10)
#define MMC_OCR_2_1V_2_2V (1<<9)
#define MMC_OCR_2_0V_2_1V (1<<8)
-#define MMC_OCR_1_9V_2_0V (1<<7)
-#define MMC_OCR_1_8V_1_9V (1<<6)
-#define MMC_OCR_1_7V_1_8V (1<<5)
-#define MMC_OCR_1_6V_1_7V (1<<4)
+#define MMC_OCR_1_65V_1_95V (1<<7)
/* R1 response type bits */
#define MMC_R1_READY_FOR_DATA (1<<8) /* ready for next transfer */
