Skip to content

Commit

Permalink
Merge tag 'amlogic-dt64-3' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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>
  • Loading branch information
Arnd Bergmann committed Oct 4, 2018
2 parents 86dc4ea + 59d925a commit b062e5b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -475,6 +475,8 @@
mmc-ddr-1_8v;
mmc-hs200-1_8v;

mmc-pwrseq = <&emmc_pwrseq>;

vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vddio_boot>;
};
Expand Down

0 comments on commit b062e5b

Please sign in to comment.