Merge tag 'mmc-updates-for-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-jammy-kernel.git] / drivers / mmc / host / davinci_mmc.c

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 20636772c09bd2aa2b794f44c3029e1f57559578..3946a0eb3a0345995b9f292816fdf53825c6d650 100644 (file)
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -34,6 +34,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/edma.h>
 #include <linux/mmc/mmc.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <linux/platform_data/mmc-davinci.h>
 
@@ -522,14 +524,16 @@ static int __init davinci_acquire_dma_channels(struct mmc_davinci_host *host)
        dma_cap_set(DMA_SLAVE, mask);
 
        host->dma_tx =
-               dma_request_channel(mask, edma_filter_fn, &host->txdma);
+               dma_request_slave_channel_compat(mask, edma_filter_fn,
+                               &host->txdma, mmc_dev(host->mmc), "tx");
        if (!host->dma_tx) {
                dev_err(mmc_dev(host->mmc), "Can't get dma_tx channel\n");
                return -ENODEV;
        }
 
        host->dma_rx =
-               dma_request_channel(mask, edma_filter_fn, &host->rxdma);
+               dma_request_slave_channel_compat(mask, edma_filter_fn,
+                               &host->rxdma, mmc_dev(host->mmc), "rx");
        if (!host->dma_rx) {
                dev_err(mmc_dev(host->mmc), "Can't get dma_rx channel\n");
                r = -ENODEV;
@@ -1157,16 +1161,86 @@ static void __init init_mmcsd_host(struct mmc_davinci_host *host)
        mmc_davinci_reset_ctrl(host, 0);
 }
 
-static int __init davinci_mmcsd_probe(struct platform_device *pdev)
+static struct platform_device_id davinci_mmc_devtype[] = {
+       {
+               .name   = "dm6441-mmc",
+               .driver_data = MMC_CTLR_VERSION_1,
+       }, {
+               .name   = "da830-mmc",
+               .driver_data = MMC_CTLR_VERSION_2,
+       },
+       {},
+};
+MODULE_DEVICE_TABLE(platform, davinci_mmc_devtype);
+
+static const struct of_device_id davinci_mmc_dt_ids[] = {
+       {
+               .compatible = "ti,dm6441-mmc",
+               .data = &davinci_mmc_devtype[MMC_CTLR_VERSION_1],
+       },
+       {
+               .compatible = "ti,da830-mmc",
+               .data = &davinci_mmc_devtype[MMC_CTLR_VERSION_2],
+       },
+       {},
+};
+MODULE_DEVICE_TABLE(of, davinci_mmc_dt_ids);
+
+static struct davinci_mmc_config
+       *mmc_parse_pdata(struct platform_device *pdev)
 {
+       struct device_node *np;
        struct davinci_mmc_config *pdata = pdev->dev.platform_data;
+       const struct of_device_id *match =
+               of_match_device(of_match_ptr(davinci_mmc_dt_ids), &pdev->dev);
+       u32 data;
+
+       np = pdev->dev.of_node;
+       if (!np)
+               return pdata;
+
+       pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata) {
+               dev_err(&pdev->dev, "Failed to allocate memory for struct davinci_mmc_config\n");
+               goto nodata;
+       }
+
+       if (match)
+               pdev->id_entry = match->data;
+
+       if (of_property_read_u32(np, "max-frequency", &pdata->max_freq))
+               dev_info(&pdev->dev, "'max-frequency' property not specified, defaulting to 25MHz\n");
+
+       of_property_read_u32(np, "bus-width", &data);
+       switch (data) {
+       case 1:
+       case 4:
+       case 8:
+               pdata->wires = data;
+               break;
+       default:
+               pdata->wires = 1;
+               dev_info(&pdev->dev, "Unsupported buswidth, defaulting to 1 bit\n");
+       }
+nodata:
+       return pdata;
+}
+
+static int __init davinci_mmcsd_probe(struct platform_device *pdev)
+{
+       struct davinci_mmc_config *pdata = NULL;
        struct mmc_davinci_host *host = NULL;
        struct mmc_host *mmc = NULL;
        struct resource *r, *mem = NULL;
        int ret = 0, irq = 0;
        size_t mem_size;
+       const struct platform_device_id *id_entry;
 
-       /* REVISIT:  when we're fully converted, fail if pdata is NULL */
+       pdata = mmc_parse_pdata(pdev);
+       if (pdata == NULL) {
+               dev_err(&pdev->dev, "Couldn't get platform data\n");
+               return -ENOENT;
+       }
 
        ret = -ENODEV;
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1190,13 +1264,15 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
 
        r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
        if (!r)
-               goto out;
-       host->rxdma = r->start;
+               dev_warn(&pdev->dev, "RX DMA resource not specified\n");
+       else
+               host->rxdma = r->start;
 
        r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
        if (!r)
-               goto out;
-       host->txdma = r->start;
+               dev_warn(&pdev->dev, "TX DMA resource not specified\n");
+       else
+               host->txdma = r->start;
 
        host->mem_res = mem;
        host->base = ioremap(mem->start, mem_size);
@@ -1237,7 +1313,9 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
        if (pdata && (pdata->wires == 8))
                mmc->caps |= (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA);
 
-       host->version = pdata->version;
+       id_entry = platform_get_device_id(pdev);
+       if (id_entry)
+               host->version = id_entry->driver_data;
 
        mmc->ops = &mmc_davinci_ops;
        mmc->f_min = 312500;
@@ -1406,22 +1484,13 @@ static struct platform_driver davinci_mmcsd_driver = {
                .name   = "davinci_mmc",
                .owner  = THIS_MODULE,
                .pm     = davinci_mmcsd_pm_ops,
+               .of_match_table = of_match_ptr(davinci_mmc_dt_ids),
        },
        .remove         = __exit_p(davinci_mmcsd_remove),
+       .id_table       = davinci_mmc_devtype,
 };
 
-static int __init davinci_mmcsd_init(void)
-{
-       return platform_driver_probe(&davinci_mmcsd_driver,
-                                    davinci_mmcsd_probe);
-}
-module_init(davinci_mmcsd_init);
-
-static void __exit davinci_mmcsd_exit(void)
-{
-       platform_driver_unregister(&davinci_mmcsd_driver);
-}
-module_exit(davinci_mmcsd_exit);
+module_platform_driver_probe(davinci_mmcsd_driver, davinci_mmcsd_probe);
 
 MODULE_AUTHOR("Texas Instruments India");
 MODULE_LICENSE("GPL");