Module Name: src
Committed By: jmcneill
Date: Sat Aug 8 14:48:41 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_sdhc.c amlogic_sdio.c
Log Message:
hook up card detect gpio
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/amlogic/amlogic_sdhc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/amlogic_sdio.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/arch/arm/amlogic/amlogic_sdhc.c
diff -u src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.9 src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.10
--- src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.9 Sat Aug 8 14:01:44 2015
+++ src/sys/arch/arm/amlogic/amlogic_sdhc.c Sat Aug 8 14:48:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_sdhc.c,v 1.9 2015/08/08 14:01:44 jmcneill Exp $ */
+/* $NetBSD: amlogic_sdhc.c,v 1.10 2015/08/08 14:48:41 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_sdhc.c,v 1.9 2015/08/08 14:01:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_sdhc.c,v 1.10 2015/08/08 14:48:41 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -443,7 +443,9 @@ amlogic_sdhc_host_maxblklen(sdmmc_chipse
static int
amlogic_sdhc_card_detect(sdmmc_chipset_handle_t sch)
{
- return 1;
+ struct amlogic_sdhc_softc *sc = sch;
+
+ return amlogic_sdhc_is_card_present(sc->sc_port);
}
static int
Index: src/sys/arch/arm/amlogic/amlogic_sdio.c
diff -u src/sys/arch/arm/amlogic/amlogic_sdio.c:1.4 src/sys/arch/arm/amlogic/amlogic_sdio.c:1.5
--- src/sys/arch/arm/amlogic/amlogic_sdio.c:1.4 Sat Aug 8 14:01:44 2015
+++ src/sys/arch/arm/amlogic/amlogic_sdio.c Sat Aug 8 14:48:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_sdio.c,v 1.4 2015/08/08 14:01:44 jmcneill Exp $ */
+/* $NetBSD: amlogic_sdio.c,v 1.5 2015/08/08 14:48:41 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_sdio.c,v 1.4 2015/08/08 14:01:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_sdio.c,v 1.5 2015/08/08 14:48:41 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -331,7 +331,9 @@ amlogic_sdio_host_maxblklen(sdmmc_chipse
static int
amlogic_sdio_card_detect(sdmmc_chipset_handle_t sch)
{
- return 1;
+ struct amlogic_sdio_softc *sc = sch;
+
+ return amlogic_sdhc_is_card_present(sc->sc_cur_port);
}
static int
