Add support for the CONFIG_MMC_BROKEN_CD option to omap_hsmmc.c
This should be selected when there is no Card Detect connection on a board.

Signed-off-by: Maarten Brock <[email protected]>
---

 drivers/mmc/omap_hsmmc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index ae742080643..9c78d5a6544 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -59,8 +59,9 @@
 DECLARE_GLOBAL_DATA_PTR;

 /* simplify defines to OMAP_HSMMC_USE_GPIO */
-#if (defined(CONFIG_OMAP_GPIO) && !defined(CONFIG_XPL_BUILD)) || \
-       (defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_GPIO))
+#if    !defined(CONFIG_MMC_BROKEN_CD) && \
+       ((defined(CONFIG_XPL_BUILD)  && defined(CONFIG_SPL_GPIO)) || \
+        (!defined(CONFIG_XPL_BUILD) && defined(CONFIG_OMAP_GPIO)))
 #define OMAP_HSMMC_USE_GPIO
 #else
 #undef OMAP_HSMMC_USE_GPIO
@@ -89,7 +90,7 @@ struct omap_hsmmc_data {
        ushort last_cmd;
 #ifdef OMAP_HSMMC_USE_GPIO
 #if CONFIG_IS_ENABLED(DM_MMC)
-       struct gpio_desc cd_gpio;       /* Change Detect GPIO */
+       struct gpio_desc cd_gpio;       /* Card Detect GPIO */
        struct gpio_desc wp_gpio;       /* Write Protect GPIO */
 #else
        int cd_gpio;
--
2.34.1

Reply via email to