aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyo Kataoka <ryo.kataoka.wt@renesas.com>2019-07-11 21:17:16 +0900
committerRyo Kataoka <ryo.kataoka.wt@renesas.com>2019-07-11 21:17:16 +0900
commit1d76a004d3a19367669b861559c1fbbf546b3065 (patch)
tree2866db6fdd4b14f8a22207462788b32f55be4e63
parent85722b9814d554c968dbf61e2b358941ced4d0b1 (diff)
parent49a5ffccf5c1dae09b52f71126a5bb4950fd38dd (diff)
downloadrenesas-bsp-master.tar.gz
Merge branch 'rcar-3.9.4/dts-rcar-gen3.rc1' into v4.14.75-ltsi/rcar-3.9.6HEADrcar-3.9.6v4.14.75-ltsi/rcar-3.9.6master
* rcar-3.9.4/dts-rcar-gen3.rc1: arm64: dts: r8a7796-salvator-xs-2x4g: Disable HS400
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts
index 664dc9250bbb7..13c5e9e63d8ec 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts
@@ -151,6 +151,10 @@
};
};
+&sdhi2 {
+ /delete-property/ mmc-hs400-1_8v;
+};
+
&vspb {
status = "okay";
};