git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am4372.dtsi
diff --git
a/arch/arm/boot/dts/am4372.dtsi
b/arch/arm/boot/dts/am4372.dtsi
index 7b5ca1bbc6a92f94500b2c3b53e63b73d6df82f0..ac55f93fc91e997deef1815adeb9d9dee9e2c555 100644
(file)
--- a/
arch/arm/boot/dts/am4372.dtsi
+++ b/
arch/arm/boot/dts/am4372.dtsi
@@
-872,6
+872,8
@@
clocks = <&adc_tsc_fck>;
clock-names = "fck";
status = "disabled";
+ dmas = <&edma 53 0>, <&edma 57 0>;
+ dma-names = "fifo0", "fifo1";
tsc {
compatible = "ti,am3359-tsc";