mmc: omap_hsmmc: Revert special init for wl1251

Due to recent changes to the mmc core, card quirks can be applied based
upon a compatible string in child OF node. The quirk needed for wl1251
(SDIO card) is managed in the core, therefore there is no longer any reason
to deal with this in omap_hsmmc too, so let's remove it.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Link: https://lore.kernel.org/r/77d313b97d1e18b0eb7ed2d88d718d960f329bb0.1636564631.git.hns@goldelico.com
[Ulf: Re-wrote the commit message to make it more clear]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 9dafcbf969d96bdfdb7fa5ceddd755e1a7fca3bf..fca30add563e9522e0677815bb34ba8371114ef3 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1499,41 +1499,6 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        omap_hsmmc_set_bus_mode(host);
 }
 
-static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
-{
-       struct omap_hsmmc_host *host = mmc_priv(mmc);
-
-       if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {
-               struct device_node *np = mmc_dev(mmc)->of_node;
-
-               /*
-                * REVISIT: should be moved to sdio core and made more
-                * general e.g. by expanding the DT bindings of child nodes
-                * to provide a mechanism to provide this information:
-                * Documentation/devicetree/bindings/mmc/mmc-card.yaml
-                */
-
-               np = of_get_compatible_child(np, "ti,wl1251");
-               if (np) {
-                       /*
-                        * We have TI wl1251 attached to MMC3. Pass this
-                        * information to the SDIO core because it can't be
-                        * probed by normal methods.
-                        */
-
-                       dev_info(host->dev, "found wl1251\n");
-                       card->quirks |= MMC_QUIRK_NONSTD_SDIO;
-                       card->cccr.wide_bus = 1;
-                       card->cis.vendor = 0x104c;
-                       card->cis.device = 0x9066;
-                       card->cis.blksize = 512;
-                       card->cis.max_dtr = 24000000;
-                       card->ocr = 0x80;
-                       of_node_put(np);
-               }
-       }
-}
-
 static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
 {
        struct omap_hsmmc_host *host = mmc_priv(mmc);
@@ -1660,7 +1625,6 @@ static struct mmc_host_ops omap_hsmmc_ops = {
        .set_ios = omap_hsmmc_set_ios,
        .get_cd = mmc_gpio_get_cd,
        .get_ro = mmc_gpio_get_ro,
-       .init_card = omap_hsmmc_init_card,
        .enable_sdio_irq = omap_hsmmc_enable_sdio_irq,
 };