public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: u-boot@lists.denx.de
Subject: [PATCH 4/4] arm: mvebu: Espressobin: Detect presence of emmc at runtime
Date: Wed, 25 Nov 2020 19:20:10 +0100	[thread overview]
Message-ID: <20201125182010.23167-5-pali@kernel.org> (raw)
In-Reply-To: <20201125182010.23167-1-pali@kernel.org>

Try to initialize emmc in board_late_init() and if it fails then we know
that emmc device is not connected.

This allows to use in U-Boot just one DTS file for all Espressobin variants
and also to correctly set fdtfile env variable for Linux kernel.

Signed-off-by: Pali Roh?r <pali@kernel.org>
Tested-by: G?rald Kerma <gerald@gk2.net>
---
 board/Marvell/mvebu_armada-37xx/board.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 73d69e0388..f67b04b78c 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
+#include <mmc.h>
 #include <phy.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
@@ -83,6 +84,7 @@ int board_init(void)
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
+	struct mmc *mmc_dev;
 	bool ddr4, emmc;
 
 	if (env_get("fdtfile"))
@@ -95,7 +97,9 @@ int board_late_init(void)
 	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
 		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
 
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	/* eMMC is mmc dev num 1 */
+	mmc_dev = find_mmc_device(1);
+	emmc = (mmc_dev && mmc_init(mmc_dev) == 0);
 
 	if (ddr4 && emmc)
 		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
-- 
2.20.1

  parent reply	other threads:[~2020-11-25 18:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-25 18:20 [PATCH 0/4] Use just one DTS file for all Espressobin variants Pali Rohár
2020-11-25 18:20 ` [PATCH 1/4] Revert "arm64: dts: armada-3720-espressobin: split common parts to .dtsi" Pali Rohár
2020-11-25 18:20 ` [PATCH 2/4] Revert "arm64: dts: a3720: add support for espressobin with populated emmc" Pali Rohár
2020-11-25 18:20 ` [PATCH 3/4] arm: mvebu: Espressobin: Add support for emmc into dts file Pali Rohár
2020-11-25 18:20 ` Pali Rohár [this message]
2020-12-02 14:35   ` [PATCH 4/4] arm: mvebu: Espressobin: Detect presence of emmc at runtime Andre Heider
2020-12-03 15:56     ` Pali Rohár
2020-12-03 16:30       ` Stefan Roese
2020-12-05 12:44         ` Pali Rohár
2020-12-07 11:07           ` Stefan Roese
2020-11-25 18:38 ` [PATCH 0/4] Use just one DTS file for all Espressobin variants Peter Robinson
2020-11-25 19:06   ` Pali Rohár
2020-12-02  0:33 ` Pali Rohár
2020-12-02  8:09   ` Stefan Roese
2020-12-02  9:12     ` Pali Rohár
2020-12-02 10:35       ` Stefan Roese
2020-12-02 12:37         ` Andre Heider
2020-12-02 14:20           ` Philipp Tomsich
2020-12-07 11:09 ` Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201125182010.23167-5-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox