mmc: omap_mmc: Remove invert references

With DM_GPIO and DM_MMC translating GPIO_ACTIVE_LOW, any boards
using the 'cd-invert' option will no longer need to do this.  This
patch removes the support for 'invert' from the MMC driver.

Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Fix warning over when !DM_GPIO]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 42ce8dcd6d00229decab4fd042c7f61150643dd1..6d31cc4422602b6cde942c8490eae434df64d509 100644 (file)
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -68,7 +68,6 @@ struct omap_hsmmc_plat {
        struct mmc_config cfg;
        struct hsmmc *base_addr;
        struct mmc *mmc;
-       bool cd_inverted;
        u32 controller_flags;
        const char *hw_rev;
 };

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 8ab56d247d26340b6d7a56e6501059f4e90e2cc8..ec853d063f0bbb19084367b31ed495a12607973a 100644 (file)
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -83,7 +83,6 @@ struct omap_hsmmc_data {
 #if CONFIG_IS_ENABLED(DM_MMC)
        struct gpio_desc cd_gpio;       /* Change Detect GPIO */
        struct gpio_desc wp_gpio;       /* Write Protect GPIO */
-       bool cd_inverted;
 #else
        int cd_gpio;
        int wp_gpio;
@@ -1368,17 +1367,15 @@ static int omap_hsmmc_set_ios(struct udevice *dev)
 #if CONFIG_IS_ENABLED(DM_MMC)
 static int omap_hsmmc_getcd(struct udevice *dev)
 {
-       struct omap_hsmmc_data *priv = dev_get_priv(dev);
        int value = -1;
 #if CONFIG_IS_ENABLED(DM_GPIO)
+       struct omap_hsmmc_data *priv = dev_get_priv(dev);
        value = dm_gpio_get_value(&priv->cd_gpio);
 #endif
        /* if no CD return as 1 */
        if (value < 0)
                return 1;
 
-       if (priv->cd_inverted)
-               return !value;
        return value;
 }
 
@@ -1860,10 +1857,6 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
        }
 #endif
 
-#ifdef OMAP_HSMMC_USE_GPIO
-       plat->cd_inverted = fdtdec_get_bool(fdt, node, "cd-inverted");
-#endif
-
        return 0;
 }
 #endif
@@ -1892,9 +1885,6 @@ static int omap_hsmmc_probe(struct udevice *dev)
        priv->base_addr = plat->base_addr;
        priv->controller_flags = plat->controller_flags;
        priv->hw_rev = plat->hw_rev;
-#ifdef OMAP_HSMMC_USE_GPIO
-       priv->cd_inverted = plat->cd_inverted;
-#endif
 
 #ifdef CONFIG_BLK
        mmc = plat->mmc;