Skip to contentSkip to conversation

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

PATCH New Pali Rohár 2 participants 2 messages Dec 21, 2020 – Dec 22, 2020 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 board/Marvell/mvebu_armada-37xx/board.c | 15 ++++++++++++---
 drivers/mmc/xenon_sdhci.c               | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +12 -3
index f67b04b78c..1b9e7520cc 100644
@@ -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)
drivers/mmc/xenon_sdhci.c +19 -0
index 6ce9d00d0a..da9882cbf6 100644
@@ -350,6 +350,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)
 {
@@ -515,6 +525,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_ofdata_to_platdata(struct udevice *dev)
 {
 	struct sdhci_host *host = dev_get_priv(dev);
@@ -564,6 +582,7 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
 	.ops		= &sdhci_ops,
 	.bind		= xenon_sdhci_bind,
 	.probe		= xenon_sdhci_probe,
+	.remove		= xenon_sdhci_remove,
 	.priv_auto_alloc_size = sizeof(struct xenon_sdhci_priv),
 	.platdata_auto_alloc_size = sizeof(struct xenon_sdhci_plat),
 };
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Disable slot when emmc is not present

Quoted 7 lines · Pali Roh?r

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.

Thanks,
Stefan

Quoted 86 lines
---
  board/Marvell/mvebu_armada-37xx/board.c | 15 ++++++++++++---
  drivers/mmc/xenon_sdhci.c               | 19 +++++++++++++++++++
  2 files changed, 31 insertions(+), 3 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +12 -3
index f67b04b78c..1b9e7520cc 100644
@@ -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)
drivers/mmc/xenon_sdhci.c +18 -0
index 6ce9d00d0a..da9882cbf6 100644
@@ -350,6 +350,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)
  {
@@ -515,6 +525,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_ofdata_to_platdata(struct udevice *dev)
  {
  	struct sdhci_host *host = dev_get_priv(dev);

drivers/mmc/xenon_sdhci.c U_BOOT_DRIVER(xenon_sdhci_drv) = { · line 588

Quoted 7 lines
drivers/mmc/xenon_sdhci.c +1 -0
@@ -564,6 +582,7 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = {
  	.ops		= &sdhci_ops,
  	.bind		= xenon_sdhci_bind,
  	.probe		= xenon_sdhci_probe,
+	.remove		= xenon_sdhci_remove,
  	.priv_auto_alloc_size = sizeof(struct xenon_sdhci_priv),
  	.platdata_auto_alloc_size = sizeof(struct xenon_sdhci_plat),
  };

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de