[PATCH 0/2] arm64: dts: meson: s400: emmc updates

[PATCH 0/2] arm64: dts: meson: s400: emmc updates

[Jerome Brunet]

This patchset adds the emmc pwrseq to the emmc node and disable the device
by default, since eMMC is not the default option for this board.

Jerome Brunet (2):
  arm64: dts: meson-axg: s400: add missing emmc pwrseq
  arm64: dts: meson-axg: s400: disable emmc

 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.17.1

[PATCH 1/2] arm64: dts: meson-axg: s400: add missing emmc pwrseq

[Jerome Brunet]

eMMC pwrseq is defined in the s400 dts but not used in the emmc node.
This is probably just a copy/paste error

Fixes: 221cf34bac54 ("ARM64: dts: meson-axg: enable the eMMC controller")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index d6467ac333ec..166ab598395e 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -493,6 +493,8 @@
 	mmc-ddr-1_8v;
 	mmc-hs200-1_8v;
 
+	mmc-pwrseq = <&emmc_pwrseq>;
+
 	vmmc-supply = <&vcc_3v3>;
 	vqmmc-supply = <&vddio_boot>;
 };
-- 
2.17.1

[PATCH 2/2] arm64: dts: meson-axg: s400: disable emmc

[Jerome Brunet]

While it is possible to rework the s400 board to solder an eMMC on it,
it is not the default option and most boards are fitted with a NAND
instead.

Let's disable the emmc device by default to reflect this. The board
equipped with an eMMC will just have to alter the DT in the
bootloader, like we do for the reserved memory regions.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 166ab598395e..c74ff1efebb8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -479,7 +479,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";
-- 
2.17.1

Re: [PATCH 0/2] arm64: dts: meson: s400: emmc updates

[Kevin Hilman]

Jerome Brunet <jbrunet@baylibre.com> writes:

> This patchset adds the emmc pwrseq to the emmc node and disable the device
> by default, since eMMC is not the default option for this board.
>
> Jerome Brunet (2):
>   arm64: dts: meson-axg: s400: add missing emmc pwrseq
>   arm64: dts: meson-axg: s400: disable emmc

Appled to v4.20/dt64.

Thanks.

Kevin

P.S.  Looks like I forgot to reply when I applied these, but these are
      already submitted to arm-soc and merged.