summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-04-19 13:44:25 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 13:54:28 +0200
commit39738cc96b66cdb175ac86aa39823963d9f2bb84 (patch)
tree663decf410f7dd02f3fcc5491e48c12c09e9e44e
parentARM: u300: augment device tree with DMA channels (diff)
downloadlinux-39738cc96b66cdb175ac86aa39823963d9f2bb84.tar.xz
linux-39738cc96b66cdb175ac86aa39823963d9f2bb84.zip
ARM: u300: add the COH 901 318 DMAC to device tree
This adds the COH 901 318 DMA controller to the U300 device tree. All devices now converted to device tree so far will start to find their DMA channels. Note that the U300 is not yet using the device tree to obtain DMA channels, but this is a first step. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/boot/dts/ste-u300.dts9
-rw-r--r--arch/arm/mach-u300/core.c2
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 6be932bee6de..4dc9f26c8b48 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -68,6 +68,15 @@
interrupts = <10>;
};
+ dmac: dma-controller@c00020000 {
+ compatible = "stericsson,coh901318";
+ reg = <0xc0020000 0x1000>;
+ interrupt-parent = <&vica>;
+ interrupts = <2>;
+ #dma-cells = <1>;
+ dma-channels = <40>;
+ };
+
i2c0: i2c@c0004000 {
compatible = "st,ddci2c";
reg = <0xc0004000 0x1000>;
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 637034b0ae44..7866f54a4eaa 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -714,6 +714,8 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = {
"coh901327_wdog", NULL),
OF_DEV_AUXDATA("stericsson,coh901331", U300_RTC_BASE,
"rtc-coh901331", NULL),
+ OF_DEV_AUXDATA("stericsson,coh901318", U300_DMAC_BASE,
+ "coh901318", NULL),
OF_DEV_AUXDATA("arm,primecell", U300_UART0_BASE,
"uart0", &uart0_plat_data),
OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,