diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/dma | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
download | u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.gz u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.bz2 u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.zip |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/apbh_dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/bcm6348-iudma.c | 1 | ||||
-rw-r--r-- | drivers/dma/dma-uclass.c | 1 | ||||
-rw-r--r-- | drivers/dma/fsl_dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/keystone_nav.c | 2 | ||||
-rw-r--r-- | drivers/dma/lpc32xx_dma.c | 2 | ||||
-rw-r--r-- | drivers/dma/sandbox-dma-test.c | 1 | ||||
-rw-r--r-- | drivers/dma/ti-edma3.c | 1 | ||||
-rw-r--r-- | drivers/dma/ti/k3-udma.c | 1 | ||||
-rw-r--r-- | drivers/dma/xilinx_dpdma.c | 1 |
10 files changed, 2 insertions, 10 deletions
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index da988f6bb6..331815c469 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -15,7 +15,6 @@ #include <asm/cache.h> #include <linux/list.h> -#include <common.h> #include <malloc.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c index 33c7b98141..fd3a353d54 100644 --- a/drivers/dma/bcm6348-iudma.c +++ b/drivers/dma/bcm6348-iudma.c @@ -15,7 +15,6 @@ * Copyright (C) 2010 Broadcom Corporation */ -#include <common.h> #include <clk.h> #include <cpu_func.h> #include <dm.h> diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 0c1d88e10c..2c76ba3fe3 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -11,7 +11,6 @@ #define LOG_CATEGORY UCLASS_DMA -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <log.h> diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index 700df2236b..0cd9bcb511 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -9,7 +9,6 @@ */ #include <config.h> -#include <common.h> #include <asm/io.h> #include <asm/fsl_dma.h> diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c index 9a5ba79f3f..c84db454bf 100644 --- a/drivers/dma/keystone_nav.c +++ b/drivers/dma/keystone_nav.c @@ -5,10 +5,10 @@ * (C) Copyright 2012-2014 * Texas Instruments Incorporated, <www.ti.com> */ -#include <common.h> #include <asm/io.h> #include <asm/ti-common/keystone_nav.h> #include <linux/delay.h> +#include <linux/string.h> struct qm_config qm_memmap = { .stat_cfg = KS2_QM_QUEUE_STATUS_BASE, diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c index 0efdfd028c..f15b67546a 100644 --- a/drivers/dma/lpc32xx_dma.c +++ b/drivers/dma/lpc32xx_dma.c @@ -7,9 +7,9 @@ * Copyright (c) 2015 Tyco Fire Protection Products. */ -#include <common.h> #include <errno.h> #include <init.h> +#include <time.h> #include <asm/arch/dma.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h> diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c index a19e5e37fb..0290b93340 100644 --- a/drivers/dma/sandbox-dma-test.c +++ b/drivers/dma/sandbox-dma-test.c @@ -7,7 +7,6 @@ * Author: Grygorii Strashko <grygorii.strashko@ti.com> */ -#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c index 31ffff07f5..d64059f39a 100644 --- a/drivers/dma/ti-edma3.c +++ b/drivers/dma/ti-edma3.c @@ -10,7 +10,6 @@ #include <asm/cache.h> #include <asm/io.h> -#include <common.h> #include <dm.h> #include <dma-uclass.h> #include <linux/dma-mapping.h> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 8f6d396653..da341a2477 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -5,7 +5,6 @@ */ #define pr_fmt(fmt) "udma: " fmt -#include <common.h> #include <cpu_func.h> #include <log.h> #include <asm/cache.h> diff --git a/drivers/dma/xilinx_dpdma.c b/drivers/dma/xilinx_dpdma.c index d4ee21dfc0..1d615ec283 100644 --- a/drivers/dma/xilinx_dpdma.c +++ b/drivers/dma/xilinx_dpdma.c @@ -3,7 +3,6 @@ * Copyright (C) 2021 Xilinx Inc. */ -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <dma.h> |