Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/broadcom Remove custom bus dma tag handling.



details:   https://anonhg.NetBSD.org/src/rev/8bd0e49a59a1
branches:  trunk
changeset: 1007442:8bd0e49a59a1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Feb 20 01:43:07 2020 +0000

description:
Remove custom bus dma tag handling.

diffstat:

 sys/arch/arm/broadcom/bcm283x_platform.c |  42 +------------------------------
 1 files changed, 2 insertions(+), 40 deletions(-)

diffs (91 lines):

diff -r 957df4c83fb0 -r 8bd0e49a59a1 sys/arch/arm/broadcom/bcm283x_platform.c
--- a/sys/arch/arm/broadcom/bcm283x_platform.c  Thu Feb 20 01:36:37 2020 +0000
+++ b/sys/arch/arm/broadcom/bcm283x_platform.c  Thu Feb 20 01:43:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm283x_platform.c,v 1.34 2020/01/01 13:54:32 skrll Exp $      */
+/*     $NetBSD: bcm283x_platform.c,v 1.35 2020/02/20 01:43:07 jmcneill Exp $   */
 
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.34 2020/01/01 13:54:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.35 2020/02/20 01:43:07 jmcneill Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
@@ -109,7 +109,6 @@
 #endif
 
 #define RPI_CPU_MAX    4
-#define BCM2711_DMA_SIZE       0x3c000000
 
 void bcm2835_platform_early_putchar(char c);
 void bcm2836_platform_early_putchar(char c);
@@ -267,28 +266,6 @@
        return bcm2711_bs_mmap(t, ba, 4 * offset, prot, flags);
 }
 
-struct arm32_dma_range bcm2835_dma_ranges[] = {
-       [0] = {
-               .dr_sysbase = 0,
-               .dr_busbase = BCM2835_BUSADDR_CACHE_COHERENT,
-       }
-};
-
-struct arm32_dma_range bcm2836_dma_ranges[] = {
-       [0] = {
-               .dr_sysbase = 0,
-               .dr_busbase = BCM2835_BUSADDR_CACHE_DIRECT,
-       }
-};
-
-struct arm32_dma_range bcm2711_dma_ranges[] = {
-       [0] = {
-               .dr_sysbase = 0,
-               .dr_busbase = BCM2835_BUSADDR_CACHE_DIRECT,
-       }
-};
-
-
 #if defined(SOC_BCM2835)
 static const struct pmap_devmap *
 bcm2835_platform_devmap(void)
@@ -1321,11 +1298,6 @@
 
        faa->faa_bst = &bcm2835_bs_tag;
        faa->faa_a4x_bst = &bcm2835_a4x_bs_tag;
-       faa->faa_dmat = &bcm2835_bus_dma_tag;
-
-       bcm2835_bus_dma_tag._ranges = bcm2835_dma_ranges;
-       bcm2835_bus_dma_tag._nranges = __arraycount(bcm2835_dma_ranges);
-       bcm2835_dma_ranges[0].dr_len = bcm283x_memorysize;
 }
 #endif
 
@@ -1336,11 +1308,6 @@
 
        faa->faa_bst = &bcm2836_bs_tag;
        faa->faa_a4x_bst = &bcm2836_a4x_bs_tag;
-       faa->faa_dmat = &bcm2835_bus_dma_tag;
-
-       bcm2835_bus_dma_tag._ranges = bcm2836_dma_ranges;
-       bcm2835_bus_dma_tag._nranges = __arraycount(bcm2836_dma_ranges);
-       bcm2836_dma_ranges[0].dr_len = bcm283x_memorysize;
 }
 
 static void
@@ -1349,11 +1316,6 @@
 
        faa->faa_bst = &bcm2711_bs_tag;
        faa->faa_a4x_bst = &bcm2711_a4x_bs_tag;
-       faa->faa_dmat = &bcm2835_bus_dma_tag;
-
-       bcm2835_bus_dma_tag._ranges = bcm2711_dma_ranges;
-       bcm2835_bus_dma_tag._nranges = __arraycount(bcm2711_dma_ranges);
-       bcm2711_dma_ranges[0].dr_len = BCM2711_DMA_SIZE;
 }
 #endif
 



Home | Main Index | Thread Index | Old Index