summaryrefslogtreecommitdiff
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-10-04 17:08:47 +0200
committerArnd Bergmann <arnd@arndb.de>2018-10-04 17:08:52 +0200
commitb062e5b79cc4b2e45f637b4f98361320e57ff676 (patch)
treecd648b4f0bdb88d8a6d63b8e0030cbe5500d2e94 /arch/arm64/boot
parent86dc4eaf12cc7f794462a53f451d785e2a526641 (diff)
parent59d925ac203b4a3d6fae3e0dda183261fb81bf7a (diff)
Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
arm64: dts: Amlogic updates for v4.20, round 3 - AXG: fix eMMC * tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: dts: meson-axg: s400: disable emmc arm64: dts: meson-axg: s400: add missing emmc pwrseq Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-axg-s400.dts4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index d4961dc8356b..18778ada7bd3 100644
--- 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>;
};