drivers: platform: Configure dma operations at probe time

Configuring DMA ops at probe time will allow deferring device probe when
the IOMMU isn't available yet.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d412fc38616c6e5382f332945aa82883fc33c141..4fa18929c090eca2c8db2528e0c8d46d79d4b2d4 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -537,6 +537,10 @@ static int platform_drv_probe(struct device *_dev)
        if (ret < 0)
                return ret;
 
+       ret = of_dma_configure_ops(_dev, _dev->of_node);
+       if (ret < 0)
+               goto done;
+
        ret = dev_pm_domain_attach(_dev, true);
        if (ret != -EPROBE_DEFER) {
                if (drv->probe) {
@@ -549,6 +553,10 @@ static int platform_drv_probe(struct device *_dev)
                }
        }
 
+       if (ret)
+               of_dma_deconfigure(_dev);
+
+done:
        if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
                dev_warn(_dev, "probe deferral not supported\n");
                ret = -ENXIO;
@@ -571,6 +579,7 @@ static int platform_drv_remove(struct device *_dev)
        if (drv->remove)
                ret = drv->remove(dev);
        dev_pm_domain_detach(_dev, true);
+       of_dma_deconfigure(_dev);
 
        return ret;
 }

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 2ed51f190691512f45d0d9e999d85ad1e11a67ec..a5ae7a34cc025ba19272e77bd7cc49a22ddfc9b9 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -179,11 +179,9 @@ static struct platform_device *of_platform_device_create_pdata(
        dev->dev.bus = &platform_bus_type;
        dev->dev.platform_data = platform_data;
        of_dma_configure_masks(&dev->dev, dev->dev.of_node);
-       of_dma_configure_ops(&dev->dev, dev->dev.of_node);
        of_msi_configure(&dev->dev, dev->dev.of_node);
 
        if (of_device_add(dev) != 0) {
-               of_dma_deconfigure(&dev->dev);
                platform_device_put(dev);
                goto err_clear_flag;
        }
@@ -480,11 +478,12 @@ static int of_platform_device_destroy(struct device *dev, void *data)
        if (dev->bus == &platform_bus_type)
                platform_device_unregister(to_platform_device(dev));
 #ifdef CONFIG_ARM_AMBA
-       else if (dev->bus == &amba_bustype)
+       else if (dev->bus == &amba_bustype) {
                amba_device_unregister(to_amba_device(dev));
+               of_dma_deconfigure(dev);
+       }
 #endif
 
-       of_dma_deconfigure(dev);
        of_node_clear_flag(dev->of_node, OF_POPULATED);
        of_node_clear_flag(dev->of_node, OF_POPULATED_BUS);
        return 0;