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 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-icnova-swac.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
index 28d3abbdc2d4c9c42edc227bc1047489f7a7cdde..794e7617f545f80e289ac8a130e541ae476beb68 100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
@@
-104,7
+104,7
@@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>
, <&mmc0_cd_pin_reference_design>
;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 8 5 GPIO_ACTIVE_HIGH>; /* PI5 */