mmc: davinci: drop support for ti,dm6441-mmc

The DM family of DaVinci SoCs is no longer supported. Drop the
irrelevant code from the driver.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index 5755c45f91717ea76801a0e2f155cde6587175ee..46f6391aa21af75ce684afd2b10f2e5c82608ff4 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -149,15 +149,9 @@ struct davinci_mmc {
        uint input_clk;         /* Input clock to MMC controller */
        uint host_caps;         /* Host capabilities */
        uint voltages;          /* Host supported voltages */
-       uint version;           /* MMC Controller version */
        struct mmc_config cfg;
 };
 
-enum {
-       MMC_CTLR_VERSION_1 = 0, /* DM644x and DM355 */
-       MMC_CTLR_VERSION_2,     /* DA830 */
-};
-
 int davinci_mmc_init(bd_t *bis, struct davinci_mmc *host);
 
 #endif /* _SDMMC_DEFS_H */

diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 27a51d6a7802f178d145c06c23b7e80ba54defa5..d4cda0a8a7fe0785d093fa792a9fb578247d4157 100644 (file)
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -342,7 +342,6 @@ static struct davinci_mmc mmc_sd0 = {
        .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE,
        .host_caps = MMC_MODE_4BIT,     /* DA850 supports only 4-bit SD/MMC */
        .voltages = MMC_VDD_32_33 | MMC_VDD_33_34,
-       .version = MMC_CTLR_VERSION_2,
 };
 
 int board_mmc_init(bd_t *bis)

diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 0d63279db00afbb31f23149b1ff3285f9211c1cc..370b18cc788a48b410b2b7b86c8a6358755ff227 100644 (file)
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -26,16 +26,10 @@
 #define clear_bit(addr, val)   set_val((addr), (get_val(addr) & ~(val)))
 
 #ifdef CONFIG_DM_MMC
-struct davinci_of_data {
-       const char *name;
-       u8 version;
-};
-
 /* Davinci MMC board definitions */
 struct davinci_mmc_priv {
        struct davinci_mmc_regs *reg_base;      /* Register base address */
        uint input_clk;         /* Input clock to MMC controller */
-       uint version;           /* MMC Controller version */
        struct gpio_desc cd_gpio;       /* Card Detect GPIO */
        struct gpio_desc wp_gpio;       /* Write Protect GPIO */
 };
@@ -173,7 +167,7 @@ davinci_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *
 
        /* Clear status registers */
        mmcstatus = get_val(&regs->mmcst0);
-       fifo_words = (host->version == MMC_CTLR_VERSION_2) ? 16 : 8;
+       fifo_words = 16;
        fifo_bytes = fifo_words << 2;
 
        /* Wait for any previous busy signal to be cleared */
@@ -211,8 +205,7 @@ davinci_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *
                set_val(&regs->mmcfifoctl,
                                (MMCFIFOCTL_FIFOLEV | MMCFIFOCTL_FIFORST));
 
-               if (host->version == MMC_CTLR_VERSION_2)
-                       cmddata |= MMCCMD_DMATRIG;
+               cmddata |= MMCCMD_DMATRIG;
 
                cmddata |= MMCCMD_WDATX;
                if (data->flags == MMC_DATA_READ) {
@@ -494,18 +487,13 @@ static int davinci_mmc_probe(struct udevice *dev)
        struct davinci_mmc_plat *plat = dev_get_platdata(dev);
        struct davinci_mmc_priv *priv = dev_get_priv(dev);
        struct mmc_config *cfg = &plat->cfg;
-       struct davinci_of_data *data =
-                       (struct davinci_of_data *)dev_get_driver_data(dev);
+
        cfg->f_min = 200000;
        cfg->f_max = 25000000;
        cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34,
        cfg->host_caps = MMC_MODE_4BIT, /* DA850 supports only 4-bit SD/MMC */
        cfg->b_max = DAVINCI_MAX_BLOCKS;
-
-       if (data) {
-               cfg->name = data->name;
-               priv->version = data->version;
-       }
+       cfg->name = "da830-mmc";
 
        priv->reg_base = (struct davinci_mmc_regs *)dev_read_addr(dev);
        priv->input_clk = clk_get(DAVINCI_MMCSD_CLKID);
@@ -528,28 +516,8 @@ static int davinci_mmc_bind(struct udevice *dev)
        return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }
 
-
-const struct davinci_of_data davinci_mmc_host_info[] = {
-       {
-               .name   = "dm6441-mmc",
-               .version = MMC_CTLR_VERSION_1,
-       },
-       {
-               .name   = "da830-mmc",
-               .version = MMC_CTLR_VERSION_2,
-       },
-       {},
-};
-
 static const struct udevice_id davinci_mmc_ids[] = {
-       {
-               .compatible = "ti,dm6441-mmc",
-               .data = (ulong) &davinci_mmc_host_info[MMC_CTLR_VERSION_1]
-       },
-       {
-               .compatible = "ti,da830-mmc",
-               .data = (ulong) &davinci_mmc_host_info[MMC_CTLR_VERSION_2]
-       },
+       { .compatible = "ti,da830-mmc" },
        {},
 };