Module Name: src
Committed By: skrll
Date: Fri Mar 20 06:23:52 UTC 2020
Modified Files:
src/sys/arch/arm/altera: cycv_dwcmmc.c
src/sys/arch/arm/samsung: exynos_dwcmmc.c
Log Message:
Provide a sc_intr_cardmask to restore the value used to that before
http://mail-index.netbsd.org/source-changes/2020/01/22/msg113182.html
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/altera/cycv_dwcmmc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/samsung/exynos_dwcmmc.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/altera/cycv_dwcmmc.c
diff -u src/sys/arch/arm/altera/cycv_dwcmmc.c:1.4 src/sys/arch/arm/altera/cycv_dwcmmc.c:1.5
--- src/sys/arch/arm/altera/cycv_dwcmmc.c:1.4 Fri Oct 18 06:50:08 2019
+++ src/sys/arch/arm/altera/cycv_dwcmmc.c Fri Mar 20 06:23:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_dwcmmc.c,v 1.4 2019/10/18 06:50:08 skrll Exp $ */
+/* $NetBSD: cycv_dwcmmc.c,v 1.5 2020/03/20 06:23:51 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.4 2019/10/18 06:50:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.5 2020/03/20 06:23:51 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -134,6 +134,7 @@ cycv_dwcmmc_attach(device_t parent, devi
sc->sc_fifo_depth = fifo_depth;
sc->sc_fifo_reg = FIFO_REG;
sc->sc_flags = DWC_MMC_F_USE_HOLD_REG | DWC_MMC_F_DMA;
+ sc->sc_intr_cardmask = DWC_MMC_INT_SDIO_INT(8);
sc->sc_card_detect = cycv_dwcmmc_card_detect;
sc->sc_write_protect = NULL;
Index: src/sys/arch/arm/samsung/exynos_dwcmmc.c
diff -u src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.9 src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.10
--- src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.9 Fri Oct 18 06:13:38 2019
+++ src/sys/arch/arm/samsung/exynos_dwcmmc.c Fri Mar 20 06:23:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_dwcmmc.c,v 1.9 2019/10/18 06:13:38 skrll Exp $ */
+/* $NetBSD: exynos_dwcmmc.c,v 1.10 2020/03/20 06:23:51 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.9 2019/10/18 06:13:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.10 2020/03/20 06:23:51 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_dwcmm
#include <arm/samsung/exynos_var.h>
+#include <dev/ic/dwc_mmc_reg.h>
#include <dev/ic/dwc_mmc_var.h>
#include <dev/fdt/fdtvar.h>
@@ -130,6 +131,7 @@ exynos_dwcmmc_attach(device_t parent, de
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
sc->sc_dmat = faa->faa_dmat;
+ sc->sc_intr_cardmask = DWC_MMC_INT_SDIO_INT(8);
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
aprint_error(": couldn't map %#" PRIxBUSADDR ": %d\n",
