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 'sound-fix-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-h3-nanopi.dtsi
diff --git
a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index 7646e331bd2934f56dfb79e358cc9692cdfb2cbb..f110ee3822398eae337c2e435e9a06375163754e 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@
-95,10
+95,7
@@
&mmc0 {
bus-width = <4>;
- cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
- cd-inverted;
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
status = "okay";
vmmc-supply = <®_vcc3v3>;
};