projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
spear1340.dtsi
diff --git
a/arch/arm/boot/dts/spear1340.dtsi
b/arch/arm/boot/dts/spear1340.dtsi
index c511c4772efdd8f85b17dac9fac18030f0782845..54d128d35681a660d2625344a54f06a10ee0bf0b 100644
(file)
--- a/
arch/arm/boot/dts/spear1340.dtsi
+++ b/
arch/arm/boot/dts/spear1340.dtsi
@@
-113,6
+113,9
@@
reg = <0xb4100000 0x1000>;
interrupts = <0 105 0x4>;
status = "disabled";
+ dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */
+ <&dwdma0 0x680 0 1 0>; /* 0xD << 7 */
+ dma-names = "tx", "rx";
};
thermal@e07008c4 {