diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-09-18 14:50:59 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 11:08:07 +0200 |
commit | 4f01a04cdeefdc52e3c5379726c293e51bdd3f2b (patch) | |
tree | a4bbdfa74202b93ebcb14f8ccda5109df84a4e7b /arch/arm/mach-ux500 | |
parent | f1ff5b2549990b5de080b52e3313cbb30c218853 (diff) | |
download | op-kernel-dev-4f01a04cdeefdc52e3c5379726c293e51bdd3f2b.zip op-kernel-dev-4f01a04cdeefdc52e3c5379726c293e51bdd3f2b.tar.gz |
ARM: ux500: Deactivate enablement of DMA40 during ATAG booting
It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 37 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices.h | 2 |
4 files changed, 0 insertions, 42 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 06eb894..3b35a73 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -92,7 +92,6 @@ extern struct amba_pl011_data uart0_plat; extern struct amba_pl011_data uart1_plat; extern struct amba_pl011_data uart2_plat; extern struct pl022_ssp_controller ssp0_plat; -extern struct stedma40_platform_data dma40_plat_data; void __init mop500_u8500uib_init(void); void __init mop500_stuib_init(void); diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index a9221cc0..9c0c9a7 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -32,7 +32,6 @@ #include "irqs.h" #include "devices-db8500.h" -#include "ste-dma40-db8500.h" #include "db8500-regs.h" #include "board-mop500.h" #include "id.h" @@ -134,7 +133,6 @@ static struct platform_device db8500_pmu_device = { }; static struct platform_device *platform_devs[] __initdata = { - &u8500_dma40_device, &db8500_pmu_device, }; diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 071b588..1b2faba 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -11,7 +11,6 @@ #include <linux/io.h> #include <linux/amba/bus.h> #include <linux/amba/pl022.h> -#include <linux/platform_data/dma-ste-dma40.h> #include <linux/mfd/dbx500-prcmu.h> #include "setup.h" @@ -19,42 +18,6 @@ #include "db8500-regs.h" #include "devices-db8500.h" -#include "ste-dma40-db8500.h" - -static struct resource dma40_resources[] = { - [0] = { - .start = U8500_DMA_BASE, - .end = U8500_DMA_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - .name = "base", - }, - [1] = { - .start = U8500_DMA_LCPA_BASE, - .end = U8500_DMA_LCPA_BASE + 2 * SZ_1K - 1, - .flags = IORESOURCE_MEM, - .name = "lcpa", - }, - [2] = { - .start = IRQ_DB8500_DMA, - .end = IRQ_DB8500_DMA, - .flags = IORESOURCE_IRQ, - } -}; - -struct stedma40_platform_data dma40_plat_data = { - .disabled_channels = {-1}, -}; - -struct platform_device u8500_dma40_device = { - .dev = { - .platform_data = &dma40_plat_data, - .coherent_dma_mask = DMA_BIT_MASK(32), - }, - .name = "dma40", - .id = 0, - .num_resources = ARRAY_SIZE(dma40_resources), - .resource = dma40_resources -}; struct prcmu_pdata db8500_prcmu_pdata = { .ab_platdata = &ab8500_platdata, diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h index da23c05..5bca7c6 100644 --- a/arch/arm/mach-ux500/devices.h +++ b/arch/arm/mach-ux500/devices.h @@ -12,6 +12,4 @@ struct amba_device; extern struct amba_device ux500_pl031_device; -extern struct platform_device u8500_dma40_device; - #endif |