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 'ipvs-for-v4.18' of http://git.kernel.org/pub/scm/linux/kernel/git/horms...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun6i-a31-colombus.dts
diff --git
a/arch/arm/boot/dts/sun6i-a31-colombus.dts
b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 85eff0307ca4236571846dae8fc47041b58533ae..939c497a6f7003957a287f13cdbf8b43490c4ef2 100644
(file)
--- a/
arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/
arch/arm/boot/dts/sun6i-a31-colombus.dts
@@
-117,8
+117,7
@@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>;
vmmc-supply = <®_vcc3v0>;
bus-width = <4>;
- cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
- cd-inverted;
+ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
status = "okay";
};