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 tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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 a275fa956813df7a34d6505c97a52c578207e3aa..ac55f93fc91e997deef1815adeb9d9dee9e2c555 100644
(file)
--- a/
arch/arm/boot/dts/am4372.dtsi
+++ b/
arch/arm/boot/dts/am4372.dtsi
@@
-189,6
+189,7
@@
reg = <0x800 0x31c>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x800 0x31c>;
#address-cells = <1>;
#size-cells = <0>;
+ #pinctrl-cells = <1>;
#interrupt-cells = <1>;
interrupt-controller;
pinctrl-single,register-width = <32>;
#interrupt-cells = <1>;
interrupt-controller;
pinctrl-single,register-width = <32>;
@@
-871,6
+872,8
@@
clocks = <&adc_tsc_fck>;
clock-names = "fck";
status = "disabled";
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";
tsc {
compatible = "ti,am3359-tsc";