system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-30 16:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: ux500: Deactivate enablement of DMA40 during ATAG booting

Browse source 
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>
This commit is contained in:
Lee Jones 2013-09-18 14:50:59 +01:00 committed by Linus Walleij
parent f1ff5b2549
commit 4f01a04cde
4 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-ux500/board-mop500.h
View file

@ -92,7 +92,6 @@ extern struct amba_pl011_data uart0_plat;
extern struct amba_pl011_data uart1_plat; extern struct amba_pl011_data uart1_plat;
extern struct amba_pl011_data uart2_plat; extern struct amba_pl011_data uart2_plat;
extern struct pl022_ssp_controller ssp0_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_u8500uib_init(void);
void __init mop500_stuib_init(void); void __init mop500_stuib_init(void);

2
arch/arm/mach-ux500/cpu-db8500.c
View file

@ -32,7 +32,6 @@
#include "irqs.h" #include "irqs.h"
#include "devices-db8500.h" #include "devices-db8500.h"
#include "ste-dma40-db8500.h"
#include "db8500-regs.h" #include "db8500-regs.h"
#include "board-mop500.h" #include "board-mop500.h"
#include "id.h" #include "id.h"
@ -134,7 +133,6 @@ static struct platform_device db8500_pmu_device = {
}; };
static struct platform_device *platform_devs[] __initdata = { static struct platform_device *platform_devs[] __initdata = {
&u8500_dma40_device,
&db8500_pmu_device, &db8500_pmu_device,
}; };

37
arch/arm/mach-ux500/devices-db8500.c
View file

@ -11,7 +11,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/pl022.h> #include <linux/amba/pl022.h>
#include <linux/platform_data/dma-ste-dma40.h>
#include <linux/mfd/dbx500-prcmu.h> #include <linux/mfd/dbx500-prcmu.h>
#include "setup.h" #include "setup.h"
@ -19,42 +18,6 @@
#include "db8500-regs.h" #include "db8500-regs.h"
#include "devices-db8500.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 = { struct prcmu_pdata db8500_prcmu_pdata = {
.ab_platdata = &ab8500_platdata, .ab_platdata = &ab8500_platdata,

2
arch/arm/mach-ux500/devices.h
View file

@ -12,6 +12,4 @@ struct amba_device;
extern struct amba_device ux500_pl031_device; extern struct amba_device ux500_pl031_device;
extern struct platform_device u8500_dma40_device;
#endif #endif