Module Name: src
Committed By: martin
Date: Sat Mar 21 20:17:49 UTC 2020
Modified Files:
src/sys/arch/arm/altera [netbsd-9]: cycv_dwcmmc.c
src/sys/arch/arm/samsung [netbsd-9]: exynos_dwcmmc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #797):
sys/arch/arm/altera/cycv_dwcmmc.c: revision 1.5
sys/arch/arm/samsung/exynos_dwcmmc.c: revision 1.10
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.3 -r1.3.4.1 src/sys/arch/arm/altera/cycv_dwcmmc.c
cvs rdiff -u -r1.8 -r1.8.4.1 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.3 src/sys/arch/arm/altera/cycv_dwcmmc.c:1.3.4.1
--- src/sys/arch/arm/altera/cycv_dwcmmc.c:1.3 Fri May 24 10:37:39 2019
+++ src/sys/arch/arm/altera/cycv_dwcmmc.c Sat Mar 21 20:17:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_dwcmmc.c,v 1.3 2019/05/24 10:37:39 jmcneill Exp $ */
+/* $NetBSD: cycv_dwcmmc.c,v 1.3.4.1 2020/03/21 20:17:49 martin 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.3 2019/05/24 10:37:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.3.4.1 2020/03/21 20:17:49 martin 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.8 src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.8.4.1
--- src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.8 Tue Apr 9 05:59:24 2019
+++ src/sys/arch/arm/samsung/exynos_dwcmmc.c Sat Mar 21 20:17:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_dwcmmc.c,v 1.8 2019/04/09 05:59:24 skrll Exp $ */
+/* $NetBSD: exynos_dwcmmc.c,v 1.8.4.1 2020/03/21 20:17:49 martin 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.8 2019/04/09 05:59:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.8.4.1 2020/03/21 20:17:49 martin 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 %#llx: %d\n",
