diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2022-11-02 11:04:02 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2022-11-02 11:04:02 +0000 |
| commit | 95e6a0faaeb41ca81ffe55c5d148a0733c5fa3ae (patch) | |
| tree | 3abe3563eefb06920ce9cbb276a3d8e42907c10d /sys/dev | |
| parent | 95ecaa0a5b03cf10717868440f655ff8234a428b (diff) | |
Re-enable ADMA2 support for arasan,sdhci-8.9a
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fdt/arasan_sdhc_fdt.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/dev/fdt/arasan_sdhc_fdt.c b/sys/dev/fdt/arasan_sdhc_fdt.c index c40fce432be..eb3da243e43 100644 --- a/sys/dev/fdt/arasan_sdhc_fdt.c +++ b/sys/dev/fdt/arasan_sdhc_fdt.c @@ -1,4 +1,4 @@ -/* $NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneill Exp $ */ +/* $NetBSD: arasan_sdhc_fdt.c,v 1.13 2022/11/02 11:04:02 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.13 2022/11/02 11:04:02 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneil #define RK3399_CORECFG_CLOCKMULTIPLIER __BITS(7,0) enum arasan_sdhc_type { - AS_TYPE_RK3399 = 1, - AS_TYPE_SDHCI_8_9A, + AS_TYPE_GENERIC, + AS_TYPE_RK3399, }; struct arasan_sdhc_softc { @@ -78,7 +78,7 @@ static const struct device_compatible_entry compat_data[] = { .value = AS_TYPE_RK3399 }, { .compat = "arasan,sdhci-8.9a", - .value = AS_TYPE_SDHCI_8_9A }, + .value = AS_TYPE_GENERIC }, DEVICE_COMPAT_EOL }; @@ -296,13 +296,6 @@ arasan_sdhc_attach(device_t parent, device_t self, void *aux) SDHC_FLAG_32BIT_ACCESS | SDHC_FLAG_USE_DMA | SDHC_FLAG_STOP_WITH_TC; - if (sc->sc_type == AS_TYPE_SDHCI_8_9A) { - /* - * Workaround for sporadic transfer errors on the Arasan SDHCI - * found in the Xilinx Zynq-7000 SoC. - */ - sc->sc_base.sc_flags |= SDHC_FLAG_BROKEN_ADMA; - } if (bus_width == 8) { sc->sc_base.sc_flags |= SDHC_FLAG_8BIT_MODE; } |
