ARM: ux500: Deactivate enablement of DMA40 during ATAG booting
authorLee Jones <lee.jones@linaro.org>
Wed, 18 Sep 2013 13:50:59 +0000 (14:50 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 26 Sep 2013 09:08:07 +0000 (11:08 +0200)
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>
arch/arm/mach-ux500/board-mop500.h
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-ux500/devices-db8500.c
arch/arm/mach-ux500/devices.h

index 06eb894eafe962416bfebc8cb61ac98938703258..3b35a73e239e2c563298d4bd8080bdb60c6156ba 100644 (file)
@@ -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);
index a9221cc019d6ca1899e133d0bb90d29217675fd0..9c0c9a70715a55a62517034e76f9bdc9eeec5138 100644 (file)
@@ -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,
 };
 
index 071b588d33b0099616c4c69985259bc397e76ebd..1b2fabaee3cef70e2f265151aa27f740999a60d0 100644 (file)
@@ -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"
 
 #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,
index da23c0596d9e1cd9e25450ae6a1cb651d202e2e0..5bca7c605cd6c1a0cc5bffb54df3f006ff338a52 100644 (file)
@@ -12,6 +12,4 @@ struct amba_device;
 
 extern struct amba_device ux500_pl031_device;
 
-extern struct platform_device u8500_dma40_device;
-
 #endif