[src/trunk]: src/sys/dev/sdmmc SDHC_VOLTAGE_SUPP_1_8V is only valid in the pr...

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

details:   https://anonhg.NetBSD.org/src/rev/6601eb2d67e1
branches:  trunk
changeset: 783473:6601eb2d67e1
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Dec 24 06:09:50 2012 +0000

description:
SDHC_VOLTAGE_SUPP_1_8V is only valid in the presence of SDHC_EMBEDDED_SLOT.
Fixes probing of full-size 1GB Toshiba card made in 2008 that fails to
respond with a 1.8V supply.  (JMB389 (in TS-RDF1) host claims
SDHC_VOLTAGE_SUPP_1_8V but does not claim SDHC_EMBEDDED_SLOT.)

diffstat:

 sys/dev/sdmmc/sdhc.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6fd8386c4e71 -r 6601eb2d67e1 sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Mon Dec 24 05:43:34 2012 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Mon Dec 24 06:09:50 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc.c,v 1.39 2012/12/23 22:33:09 jakllsch Exp $       */
+/*     $NetBSD: sdhc.c,v 1.40 2012/12/24 06:09:50 jakllsch 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.39 2012/12/23 22:33:09 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.40 2012/12/24 06:09:50 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -350,7 +350,8 @@
        /*
         * Determine SD bus voltage levels supported by the controller.
         */
-       if (ISSET(caps, SDHC_VOLTAGE_SUPP_1_8V)) {
+       if (ISSET(caps, SDHC_EMBEDDED_SLOT) &&
+           ISSET(caps, SDHC_VOLTAGE_SUPP_1_8V)) {
                SET(hp->ocr, MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V);
        }
        if (ISSET(caps, SDHC_VOLTAGE_SUPP_3_0V)) {