summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm2708
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-04-28 19:24:30 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:12:39 +0100
commit8969dda249661e5a8760b92af60542b78cea50fd (patch)
tree689e3052038b5affe3982875054cfe44cad46c18 /arch/arm/mach-bcm2708
parent9aef777973b8a710a0baff2573eb262659d7f6d9 (diff)
downloadlinux-8969dda249661e5a8760b92af60542b78cea50fd.tar.gz
BCM270x: Add memory and irq resources to dmaengine device and DT
Prepare for merging of the legacy DMA API arch driver dma.c with bcm2708-dmaengine by adding memory and irq resources both to platform file device and Device Tree node. Don't use BCM_DMAMAN_DRIVER_NAME so we don't have to include mach/dma.h Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Diffstat (limited to 'arch/arm/mach-bcm2708')
-rw-r--r--arch/arm/mach-bcm2708/bcm2708.c65
1 files changed, 63 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
index b848e4a1aa67..703215dea73c 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -55,7 +55,6 @@
#include <asm/mach/map.h>
#include <mach/timex.h>
-#include <mach/dma.h>
#include <mach/vcio.h>
#include <mach/system.h>
@@ -257,15 +256,77 @@ static struct resource bcm2708_dmaman_resources[] = {
};
static struct platform_device bcm2708_dmaman_device = {
- .name = BCM_DMAMAN_DRIVER_NAME,
+ .name = "bcm2708_dma",
.id = 0, /* first bcm2708_dma */
.resource = bcm2708_dmaman_resources,
.num_resources = ARRAY_SIZE(bcm2708_dmaman_resources),
};
+static struct resource bcm2708_dmaengine_resources[] = {
+ {
+ .start = DMA_BASE,
+ .end = DMA_BASE + SZ_4K - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = IRQ_DMA0,
+ .end = IRQ_DMA0,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA1,
+ .end = IRQ_DMA1,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA2,
+ .end = IRQ_DMA2,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA3,
+ .end = IRQ_DMA3,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA4,
+ .end = IRQ_DMA4,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA5,
+ .end = IRQ_DMA5,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA6,
+ .end = IRQ_DMA6,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA7,
+ .end = IRQ_DMA7,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA8,
+ .end = IRQ_DMA8,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA9,
+ .end = IRQ_DMA9,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA10,
+ .end = IRQ_DMA10,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA11,
+ .end = IRQ_DMA11,
+ .flags = IORESOURCE_IRQ,
+ }, {
+ .start = IRQ_DMA12,
+ .end = IRQ_DMA12,
+ .flags = IORESOURCE_IRQ,
+ }
+};
+
static struct platform_device bcm2708_dmaengine_device = {
.name = "bcm2708-dmaengine",
.id = -1,
+ .resource = bcm2708_dmaengine_resources,
+ .num_resources = ARRAY_SIZE(bcm2708_dmaengine_resources),
};
#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)