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>

diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 6be932bee6de4f94b4f190123075cca5afac96b5..4dc9f26c8b48d411f969d256b12966ccacdb452a 100644 (file)
--- 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 637034b0ae44c5afd08f1d7b0e499e2973d07a79..7866f54a4eaa927e1b2c3787e21048802c3e2e6b 100644 (file)
--- 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,