[src/trunk]: src/sys/dev/sdmmc Use 1.65-1.95 voltage window for 1.8V support.

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4db646eee993
branches:  trunk
changeset: 817139:4db646eee993
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Wed Aug 10 04:24:17 2016 +0000

description:
Use 1.65-1.95 voltage window for 1.8V support.

diffstat:

 sys/dev/sdmmc/sdhc.c     |  8 ++++----
 sys/dev/sdmmc/sdmmcreg.h |  7 ++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diffs (57 lines):

diff -r c1cb905aac1d -r 4db646eee993 sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Tue Aug 09 21:08:02 2016 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Wed Aug 10 04:24:17 2016 +0000
@@ -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 @@
                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 @@
         * 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;
diff -r c1cb905aac1d -r 4db646eee993 sys/dev/sdmmc/sdmmcreg.h
--- a/sys/dev/sdmmc/sdmmcreg.h  Tue Aug 09 21:08:02 2016 +0000
+++ b/sys/dev/sdmmc/sdmmcreg.h  Wed Aug 10 04:24:17 2016 +0000
@@ -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 */