Skip to content

Commit b1020b5

Browse files
committed
BCM270x: Remove dmaman device
Remove the dmaman device since the dmaengine now handles the legacy API manager. Signed-off-by: Noralf Trønnes <[email protected]>
1 parent f89ecdc commit b1020b5

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

arch/arm/mach-bcm2708/bcm2708.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -247,21 +247,6 @@ static struct amba_device *amba_devs[] __initdata = {
247247
&uart0_device,
248248
};
249249

250-
static struct resource bcm2708_dmaman_resources[] = {
251-
{
252-
.start = DMA_BASE,
253-
.end = DMA_BASE + SZ_4K - 1,
254-
.flags = IORESOURCE_MEM,
255-
}
256-
};
257-
258-
static struct platform_device bcm2708_dmaman_device = {
259-
.name = "bcm2708_dma",
260-
.id = 0, /* first bcm2708_dma */
261-
.resource = bcm2708_dmaman_resources,
262-
.num_resources = ARRAY_SIZE(bcm2708_dmaman_resources),
263-
};
264-
265250
static struct resource bcm2708_dmaengine_resources[] = {
266251
{
267252
.start = DMA_BASE,
@@ -919,7 +904,6 @@ void __init bcm2708_init(void)
919904
bcm2708_init_clocks();
920905
bcm2708_dt_init();
921906

922-
bcm_register_device(&bcm2708_dmaman_device);
923907
bcm_register_device_dt(&bcm2708_dmaengine_device);
924908
bcm_register_device(&bcm2708_vcio_device);
925909
#ifdef CONFIG_BCM2708_GPIO

arch/arm/mach-bcm2709/bcm2709.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -257,21 +257,6 @@ static struct amba_device *amba_devs[] __initdata = {
257257
&uart0_device,
258258
};
259259

260-
static struct resource bcm2708_dmaman_resources[] = {
261-
{
262-
.start = DMA_BASE,
263-
.end = DMA_BASE + SZ_4K - 1,
264-
.flags = IORESOURCE_MEM,
265-
}
266-
};
267-
268-
static struct platform_device bcm2708_dmaman_device = {
269-
.name = "bcm2708_dma",
270-
.id = 0, /* first bcm2708_dma */
271-
.resource = bcm2708_dmaman_resources,
272-
.num_resources = ARRAY_SIZE(bcm2708_dmaman_resources),
273-
};
274-
275260
static struct resource bcm2708_dmaengine_resources[] = {
276261
{
277262
.start = DMA_BASE,
@@ -940,7 +925,6 @@ void __init bcm2709_init(void)
940925
bcm2709_init_clocks();
941926
bcm2709_dt_init();
942927

943-
bcm_register_device(&bcm2708_dmaman_device);
944928
bcm_register_device_dt(&bcm2708_dmaengine_device);
945929
bcm_register_device(&bcm2708_vcio_device);
946930
#ifdef CONFIG_BCM2708_GPIO

0 commit comments

Comments
 (0)