arm: mvebu: Espressobin: Disable slot when emmc is not present

This change extends previous commit 061c6d1b238a ("arm: mvebu: Espressobin:
Detect presence of emmc at runtime") and when emmc is not present then emmc
is removed from U-Boot DM and corresponding slot is disabled. Therefore on
Espressobin board without soldered emmc, state of emmc hw should be same as
if emmc was disabled in DTS.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index f67b04b78cc70d81f563b5614013104da59299ad..1b9e7520cc7addc373bf07c96833289498a40626 100644 (file)
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/device-internal.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
@@ -84,12 +85,10 @@ int board_init(void)
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
+       struct udevice *dev;
        struct mmc *mmc_dev;
        bool ddr4, emmc;
 
-       if (env_get("fdtfile"))
-               return 0;
-
        if (!of_machine_is_compatible("globalscale,espressobin"))
                return 0;
 
@@ -101,6 +100,16 @@ int board_late_init(void)
        mmc_dev = find_mmc_device(1);
        emmc = (mmc_dev && mmc_init(mmc_dev) == 0);
 
+       /* if eMMC is not present then remove it from DM */
+       if (!emmc && mmc_dev) {
+               dev = mmc_dev->dev;
+               device_remove(dev, DM_REMOVE_NORMAL);
+               device_unbind(dev);
+       }
+
+       if (env_get("fdtfile"))
+               return 0;
+
        if (ddr4 && emmc)
                env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
        else if (ddr4)

diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 14fec4b8e78cf3a91dc64cc7feb1921fb803c2ae..d6356944019756646efe62d31986f8fac8f3095e 100644 (file)
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -338,6 +338,16 @@ static void xenon_mmc_enable_slot(struct sdhci_host *host, u8 slot)
        sdhci_writel(host, var, SDHC_SYS_OP_CTRL);
 }
 
+/* Disable specific slot */
+static void xenon_mmc_disable_slot(struct sdhci_host *host, u8 slot)
+{
+       u32 var;
+
+       var = sdhci_readl(host, SDHC_SYS_OP_CTRL);
+       var &= ~(SLOT_MASK(slot) << SLOT_ENABLE_SHIFT);
+       sdhci_writel(host, var, SDHC_SYS_OP_CTRL);
+}
+
 /* Enable Parallel Transfer Mode */
 static void xenon_mmc_enable_parallel_tran(struct sdhci_host *host, u8 slot)
 {
@@ -503,6 +513,14 @@ static int xenon_sdhci_probe(struct udevice *dev)
        return ret;
 }
 
+static int xenon_sdhci_remove(struct udevice *dev)
+{
+       struct sdhci_host *host = dev_get_priv(dev);
+
+       xenon_mmc_disable_slot(host, XENON_MMC_SLOT_ID_HYPERION);
+       return 0;
+}
+
 static int xenon_sdhci_of_to_plat(struct udevice *dev)
 {
        struct sdhci_host *host = dev_get_priv(dev);
@@ -552,6 +570,7 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
        .ops            = &sdhci_ops,
        .bind           = xenon_sdhci_bind,
        .probe          = xenon_sdhci_probe,
+       .remove         = xenon_sdhci_remove,
        .priv_auto      = sizeof(struct xenon_sdhci_priv),
        .plat_auto      = sizeof(struct xenon_sdhci_plat),
 };