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 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
amlogic
/
meson-gx-p23x-q20x.dtsi
diff --git
a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index 4157987f4a3d2515053c1b5a49031c32f7f3b652..7d4b95e499935db8bd0ec7637bcac4492973f388 100644
(file)
--- a/
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@
-213,7
+213,7
@@
/* eMMC */
&sd_emmc_c {
status = "okay";
- pinctrl-0 = <&emmc_pins>;
+ pinctrl-0 = <&emmc_pins>
, <&emmc_ds_pins>
;
pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate";