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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-olinuxino-lime2-emmc.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
index 10d307408f237f21d15fdbe2bf84de5b4db40f0a..81f376f2a44d17eec47200b56bb08a62839ac193 100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@
-57,10
+57,8
@@
&pio {
mmc2_pins_nrst: mmc2-rst-pin {
- allwinner,pins = "PC16";
- allwinner,function = "gpio_out";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PC16";
+ function = "gpio_out";
};
};