commit 2d18c8c1b08941c99d70d1b76d9afb85c84df5a8
author Neil Armstrong <narmstrong@baylibre.com> Mon Apr 20 15:44:41 2020 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Tue Apr 28 10:23:10 2020 +0200
tree 2db49f1a4d656d02379d2bb4b86bc0c202c970e5
parent 86724a5b491b9a043799e70623990188c52a4eca

arm64: dts: meson: sync dt and bindings from v5.7-rc1

Sync the device tree and dt-bindings from Linux v5.7-rc1 8f3d9f354286
("Linux 5.7-rc1").

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

arch/arm/dts/meson-g12a-u200.dts

diff --git a/arch/arm/dts/meson-g12a-u200.dts b/arch/arm/dts/meson-g12a-u200.dts
index 2a324f0..a26bfe7 100644
--- a/arch/arm/dts/meson-g12a-u200.dts
+++ b/arch/arm/dts/meson-g12a-u200.dts
@@ -271,7 +271,7 @@
 /* eMMC */
 &sd_emmc_c {
 	status = "okay";
-	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";