Module Name: src
Committed By: jmcneill
Date: Tue Mar 23 22:27:38 UTC 2021
Modified Files:
src/sys/dev/fdt: dwcmmc_fdt.c
Log Message:
Match generic "snps,dw-mshc" compat string as found in BeagleV.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/fdt/dwcmmc_fdt.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/dev/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.16 src/sys/dev/fdt/dwcmmc_fdt.c:1.17
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.16 Wed Jan 27 03:10:21 2021
+++ src/sys/dev/fdt/dwcmmc_fdt.c Tue Mar 23 22:27:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.16 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.17 2021/03/23 22:27:38 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.16 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.17 2021/03/23 22:27:38 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -66,8 +66,14 @@ static const struct dwcmmc_fdt_config dw
.intr_cardmask = __BIT(24),
};
+static const struct dwmmc_fdt_config dwmmc_default_config = {
+ .flags = DWC_MMC_F_USE_HOLD_REG |
+ DWC_MMC_F_DMA,
+};
+
static const struct device_compatible_entry compat_data[] = {
{ .compat = "rockchip,rk3288-dw-mshc", .data = &dwcmmc_rk3288_config },
+ { .compat = "snps,dw-mshc", .data = &dwmmc_default_config },
DEVICE_COMPAT_EOL
};
@@ -158,7 +164,7 @@ dwcmmc_fdt_attach(device_t parent, devic
sc->sc_bus_width = 4;
sc->sc_fifo_depth = fifo_depth;
- sc->sc_intr_cardmask = esc->sc_conf->intr_cardmask;
+ sc->sc_entr_cardmask = esc->sc_conf->intr_cardmask;
sc->sc_ciu_div = esc->sc_conf->ciu_div;
sc->sc_flags = esc->sc_conf->flags;
sc->sc_pre_power_on = dwcmmc_fdt_pre_power_on;
