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 branch 'for-linus' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
amlogic
/
meson-gxl-s905x-p212.dtsi
diff --git
a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index 129af9068814d3b0f8e33090adbcda435ea3e202..ff09df1fd5a3233b4d84d7b8a5fb01839db7c0e2 100644
(file)
--- a/
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@
-135,7
+135,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";