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-mk808c.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index c4ee30709f3a1875d5e5ea2c36677707dd1db9a9..f7413094183c01e538068c089653c7c44dc640ba 100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@
-109,7
+109,7
@@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>
, <&mmc0_cd_pin_reference_design>
;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */