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 'dma-mapping-5.1' of git://git.infradead.org/users/hch/dma-mapping
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
hisilicon
/
hi3660-hikey960.dts
diff --git
a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 46435466f1ab2e67ecc4e456fab845f5f443de01..e035cf195b19a541fd071c42928845f3fe320543 100644
(file)
--- a/
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@
-581,8
+581,7
@@
sd-uhs-sdr50;
sd-uhs-sdr104;
disable-wp;
- cd-inverted;
- cd-gpios = <&gpio25 3 0>;
+ cd-gpios = <&gpio25 3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&sd_pmx_func
&sd_clk_cfg_func