Module Name: src
Committed By: matt
Date: Thu Jul 12 03:05:49 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
Add a flag for the lack of LED_ON in HOST_CTL (ti omap3 doesn't do that).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sdmmc/sdhcvar.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.13 src/sys/dev/sdmmc/sdhc.c:1.14
--- src/sys/dev/sdmmc/sdhc.c:1.13 Thu Mar 15 18:37:43 2012
+++ src/sys/dev/sdmmc/sdhc.c Thu Jul 12 03:05:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.13 2012/03/15 18:37:43 bouyer Exp $ */
+/* $NetBSD: sdhc.c,v 1.14 2012/07/12 03:05:49 matt 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.13 2012/03/15 18:37:43 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.14 2012/07/12 03:05:49 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1031,7 +1031,8 @@ out:
}
#endif
- if (!ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)) {
+ if (!ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)
+ && !ISSET(hp->sc->sc_flags, SDHC_FLAG_NO_LED_ON)) {
mutex_enter(&hp->host_mtx);
/* Turn off the LED. */
HCLR1(hp, SDHC_HOST_CTL, SDHC_LED_ON);
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.6 src/sys/dev/sdmmc/sdhcvar.h:1.7
--- src/sys/dev/sdmmc/sdhcvar.h:1.6 Wed Feb 1 23:03:30 2012
+++ src/sys/dev/sdmmc/sdhcvar.h Thu Jul 12 03:05:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.6 2012/02/01 23:03:30 matt Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.7 2012/07/12 03:05:49 matt Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -43,6 +43,7 @@ struct sdhc_softc {
#define SDHC_FLAG_ENHANCED 0x0020 /* Freescale ESDHC */
#define SDHC_FLAG_8BIT_MODE 0x0040 /* MMC 8bit mode is supported */
#define SDHC_FLAG_HAVE_CGM 0x0080 /* Netlogic XLP */
+#define SDHC_FLAG_NO_LED_ON 0x0100 /* LED_ON unsupported in HOST_CTL */
uint32_t sc_clkbase;
};
