Merge tag 'trace-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / amlogic / meson-axg-s400.dts

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index d4961dc8356b530b1958d4ca7ab25210cd75cb08..18778ada7bd32527f6060b51df09bbafd97b44ff 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -461,7 +461,7 @@
 
 /* emmc storage */
 &sd_emmc_c {
-       status = "okay";
+       status = "disabled";
        pinctrl-0 = <&emmc_pins>;
        pinctrl-1 = <&emmc_clk_gate_pins>;
        pinctrl-names = "default", "clk-gate";
@@ -475,6 +475,8 @@
        mmc-ddr-1_8v;
        mmc-hs200-1_8v;
 
+       mmc-pwrseq = <&emmc_pwrseq>;
+
        vmmc-supply = <&vcc_3v3>;
        vqmmc-supply = <&vddio_boot>;
 };