Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/sdmmc Add a flag for the lack of LED_ON in HOST_CTL ...



details:   https://anonhg.NetBSD.org/src/rev/cf70db11c93b
branches:  trunk
changeset: 780103:cf70db11c93b
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jul 12 03:05:49 2012 +0000

description:
Add a flag for the lack of LED_ON in HOST_CTL (ti omap3 doesn't do that).

diffstat:

 sys/dev/sdmmc/sdhc.c    |  7 ++++---
 sys/dev/sdmmc/sdhcvar.h |  3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r baa713615cb0 -r cf70db11c93b sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Thu Jul 12 03:05:01 2012 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Thu Jul 12 03:05:49 2012 +0000
@@ -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 @@
        }
 #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 -r baa713615cb0 -r cf70db11c93b sys/dev/sdmmc/sdhcvar.h
--- a/sys/dev/sdmmc/sdhcvar.h   Thu Jul 12 03:05:01 2012 +0000
+++ b/sys/dev/sdmmc/sdhcvar.h   Thu Jul 12 03:05:49 2012 +0000
@@ -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 @@
 #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;
 };
 



Home | Main Index | Thread Index | Old Index