Module Name: src
Committed By: jmcneill
Date: Sat May 30 17:52:07 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
support 8-bit mode for SDHC 3.0+ controllers
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 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.58 src/sys/dev/sdmmc/sdhc.c:1.59
--- src/sys/dev/sdmmc/sdhc.c:1.58 Sun May 3 22:37:27 2015
+++ src/sys/dev/sdmmc/sdhc.c Sat May 30 17:52:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.58 2015/05/03 22:37:27 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.59 2015/05/30 17:52:07 jmcneill 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.58 2015/05/03 22:37:27 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.59 2015/05/30 17:52:07 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1029,8 +1029,14 @@ sdhc_bus_width(sdmmc_chipset_handle_t sc
reg |= SDHC_ESDHC_8BIT_MODE;
} else {
reg &= ~SDHC_4BIT_MODE;
- if (width == 4)
+ if (hp->specver >= SDHC_SPEC_VERS_300) {
+ reg &= ~SDHC_8BIT_MODE;
+ }
+ if (width == 4) {
reg |= SDHC_4BIT_MODE;
+ } else if (width == 8 && hp->specver >= SDHC_SPEC_VERS_300) {
+ reg |= SDHC_8BIT_MODE;
+ }
}
HWRITE1(hp, SDHC_HOST_CTL, reg);
mutex_exit(&hp->host_mtx);
