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 v4.13 intel_pstate fixes.
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun4i-a10-mk802.dts
diff --git
a/arch/arm/boot/dts/sun4i-a10-mk802.dts
b/arch/arm/boot/dts/sun4i-a10-mk802.dts
index 2b75745cd246a93267a5708d0836c2aa48399f26..81db6824a2c79c7441f1aa335abde6f84b45e341 100644
(file)
--- a/
arch/arm/boot/dts/sun4i-a10-mk802.dts
+++ b/
arch/arm/boot/dts/sun4i-a10-mk802.dts
@@
-72,7
+72,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 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */