diff options
| author | matt <matt@NetBSD.org> | 2012-07-12 03:05:49 +0000 |
|---|---|---|
| committer | matt <matt@NetBSD.org> | 2012-07-12 03:05:49 +0000 |
| commit | 9bf8205b297dd5c705ac07fec1c3e4b3cee65e9c (patch) | |
| tree | eb5584e6c46cab7175331581e88a0cd88ddc9043 /sys/dev | |
| parent | d5e682e5d272ccb7bd4b02f1ce7f31475ccaf37a (diff) | |
Add a flag for the lack of LED_ON in HOST_CTL (ti omap3 doesn't do that).
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sdmmc/sdhc.c | 7 | ||||
| -rw-r--r-- | sys/dev/sdmmc/sdhcvar.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c index 38873628072..148186339ad 100644 --- a/sys/dev/sdmmc/sdhc.c +++ b/sys/dev/sdmmc/sdhc.c @@ -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); diff --git a/sys/dev/sdmmc/sdhcvar.h b/sys/dev/sdmmc/sdhcvar.h index 35c6a24f201..0696e5f09eb 100644 --- a/sys/dev/sdmmc/sdhcvar.h +++ b/sys/dev/sdmmc/sdhcvar.h @@ -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; }; |
