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 'pwm/for-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
vf610-zii-dev.dtsi
diff --git
a/arch/arm/boot/dts/vf610-zii-dev.dtsi
b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index 6b58d3a97992c11daa3fabe5aea74f3531bd1f46..aadd36db0092d661991bc3123bffb87b26a1822c 100644
(file)
--- a/
arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/
arch/arm/boot/dts/vf610-zii-dev.dtsi
@@
-96,6
+96,10
@@
status = "okay";
};
+&edma1 {
+ status = "okay";
+};
+
&esdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc1>;