[src/netbsd-9]: src/sys/arch/arm Pull up following revision(s) (requested by ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0020456b9a41
branches:  netbsd-9
changeset: 843990:0020456b9a41
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Mar 21 20:17:49 2020 +0000

description:
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

diffstat:

 sys/arch/arm/altera/cycv_dwcmmc.c    |  5 +++--
 sys/arch/arm/samsung/exynos_dwcmmc.c |  6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 176146823073 -r 0020456b9a41 sys/arch/arm/altera/cycv_dwcmmc.c
--- a/sys/arch/arm/altera/cycv_dwcmmc.c Sat Mar 21 20:01:01 2020 +0000
+++ b/sys/arch/arm/altera/cycv_dwcmmc.c Sat Mar 21 20:17:49 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        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;
diff -r 176146823073 -r 0020456b9a41 sys/arch/arm/samsung/exynos_dwcmmc.c
--- a/sys/arch/arm/samsung/exynos_dwcmmc.c      Sat Mar 21 20:01:01 2020 +0000
+++ b/sys/arch/arm/samsung/exynos_dwcmmc.c      Sat Mar 21 20:17:49 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 
 #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 @@
        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",