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 branch 'omap-for-v4.21/dt' into omap-for-v5.1/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-olimex-som-evb-emmc.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
index 81ebc97b76ee8e67943444c7a8880aa387870d67..20bf09b2226cf4780a8e7642ed5d1954c4966632 100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
@@
-21,8
+21,6
@@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <®_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;