Module Name: src
Committed By: martin
Date: Tue Jan 27 08:17:09 UTC 2015
Modified Files:
src/sys/dev/sdmmc [netbsd-7]: sdhc.c sdhcreg.h
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #460):
sys/dev/sdmmc/sdhcreg.h: revision 1.12
sys/dev/sdmmc/sdhc.c: revision 1.52
eSDHC has non standard Host Controller Version Register offset.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.5 -r1.44.2.6 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.11 -r1.11.12.1 src/sys/dev/sdmmc/sdhcreg.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.44.2.5 src/sys/dev/sdmmc/sdhc.c:1.44.2.6
--- src/sys/dev/sdmmc/sdhc.c:1.44.2.5 Sun Oct 5 20:00:54 2014
+++ src/sys/dev/sdmmc/sdhc.c Tue Jan 27 08:17:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.44.2.5 2014/10/05 20:00:54 martin Exp $ */
+/* $NetBSD: sdhc.c,v 1.44.2.6 2015/01/27 08:17:09 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.2.5 2014/10/05 20:00:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.44.2.6 2015/01/27 08:17:09 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -268,7 +268,11 @@ sdhc_host_found(struct sdhc_softc *sc, b
mutex_init(&hp->intr_mtx, MUTEX_DEFAULT, IPL_SDMMC);
cv_init(&hp->intr_cv, "sdhcintr");
- sdhcver = HREAD2(hp, SDHC_HOST_CTL_VERSION);
+ if (ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)) {
+ sdhcver = HREAD4(hp, SDHC_ESDHC_HOST_CTL_VERSION);
+ } else {
+ sdhcver = HREAD2(hp, SDHC_HOST_CTL_VERSION);
+ }
aprint_normal_dev(sc->sc_dev, "SD Host Specification ");
hp->specver = SDHC_SPEC_VERSION(sdhcver);
switch (SDHC_SPEC_VERSION(sdhcver)) {
Index: src/sys/dev/sdmmc/sdhcreg.h
diff -u src/sys/dev/sdmmc/sdhcreg.h:1.11 src/sys/dev/sdmmc/sdhcreg.h:1.11.12.1
--- src/sys/dev/sdmmc/sdhcreg.h:1.11 Mon Dec 24 05:43:34 2012
+++ src/sys/dev/sdmmc/sdhcreg.h Tue Jan 27 08:17:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcreg.h,v 1.11 2012/12/24 05:43:34 jakllsch Exp $ */
+/* $NetBSD: sdhcreg.h,v 1.11.12.1 2015/01/27 08:17:09 martin Exp $ */
/* $OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $ */
/*
@@ -170,6 +170,7 @@
#define SDHC_WATERMARK_READ_MASK 0xff
#define SDHC_MAX_CAPABILITIES 0x48
#define SDHC_SLOT_INTR_STATUS 0xfc
+#define SDHC_ESDHC_HOST_CTL_VERSION 0xfc /* eSDHC */
#define SDHC_HOST_CTL_VERSION 0xfe
#define SDHC_SPEC_VERS_SHIFT 0
#define SDHC_SPEC_VERS_MASK 0xff
