Module Name: src Committed By: martin Date: Wed Oct 1 08:53:43 UTC 2014
Modified Files: src/sys/dev/sdmmc [netbsd-7]: sdhc.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #123): sys/dev/sdmmc/sdhc.c: revision 1.48 Don't check slot type for pre-3.0 controllers, the bits were reserved at the time. If an older controller advertises 1.8V support, just use it. This fixes high-speed mode support for me on BeagleBone Black. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/dev/sdmmc/sdhc.c 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.44 src/sys/dev/sdmmc/sdhc.c:1.44.2.1 --- src/sys/dev/sdmmc/sdhc.c:1.44 Sat May 24 12:10:32 2014 +++ src/sys/dev/sdmmc/sdhc.c Wed Oct 1 08:53:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.44 2014/05/24 12:10:32 hkenken Exp $ */ +/* $NetBSD: sdhc.c,v 1.44.2.1 2014/10/01 08:53:43 martin 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.44 2014/05/24 12:10:32 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.44.2.1 2014/10/01 08:53:43 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -353,8 +353,9 @@ sdhc_host_found(struct sdhc_softc *sc, b /* * Determine SD bus voltage levels supported by the controller. */ - if (ISSET(caps, SDHC_EMBEDDED_SLOT) && - ISSET(caps, SDHC_VOLTAGE_SUPP_1_8V)) { + if (ISSET(caps, SDHC_VOLTAGE_SUPP_1_8V) && + (hp->specver < SDHC_SPEC_VERS_300 || + ISSET(caps, SDHC_EMBEDDED_SLOT))) { SET(hp->ocr, MMC_OCR_1_7V_1_8V | MMC_OCR_1_8V_1_9V); } if (ISSET(caps, SDHC_VOLTAGE_SUPP_3_0V)) {