mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl12...

commit f6498b922e57aecbe3b7fa30a308d9d586c0c369 upstream.

Pandora_wl1251_init_card was used to do special pdata based
setup of the sdio mmc interface. This does no longer work with
v4.7 and later. A fix requires a device tree based mmc3 setup.

Therefore we move the special setup to omap_hsmmc.c instead
of calling some pdata supplied init_card function.

The new code checks for a DT child node compatible to wl1251
so it will not affect other MMC3 use cases.

Generally, this code was and still is a hack and should be
moved to mmc core to e.g. read such properties from optional
DT child nodes.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # v4.7+
[Ulf: Fixed up some checkpatch complaints]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index b23c57e..0135693 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1661,6 +1661,36 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
 
        if (mmc_pdata(host)->init_card)
                mmc_pdata(host)->init_card(card);
+       else 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.txt
+                */
+
+               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)