summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-05-02 12:38:52 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 15:54:27 +0400
commitefb9bc2ea072c6f0a412808fa06ee41f78b0544f (patch)
tree6aa747a72e843b0a516998ea348398d483dc4013 /arch
parentfaadc6e3d5e0ab718dc1e131fb14bbb52f144238 (diff)
downloadlinux-efb9bc2ea072c6f0a412808fa06ee41f78b0544f.tar.xz
ARM: u300: augment device tree with DMA channels
This adds DMA channel assignments to the MMC/SD-controller and the two UARTs already in the U300 device tree, as we have now defined a way to obtain DMA channels from the device tree. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/ste-u300.dts6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index ae51dd109422..6be932bee6de 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -185,6 +185,8 @@
reg = <0xc0013000 0x1000>;
interrupt-parent = <&vica>;
interrupts = <22>;
+ dmas = <&dmac 17 &dmac 18>;
+ dma-names = "tx", "rx";
};
uart1: serial@c0007000 {
@@ -192,6 +194,8 @@
reg = <0xc0007000 0x1000>;
interrupt-parent = <&vicb>;
interrupts = <20>;
+ dmas = <&dmac 38 &dmac 39>;
+ dma-names = "tx", "rx";
};
mmcsd: mmcsd@c0001000 {
@@ -206,6 +210,8 @@
cd-gpios = <&gpio 12 0x4>;
cd-inverted;
vmmc-supply = <&ab3100_ldo_g_reg>;
+ dmas = <&dmac 14>;
+ dma-names = "rx";
};
};
};