]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: dw: platform: Split OF helpers to separate module
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 20 Aug 2019 13:15:46 +0000 (16:15 +0300)
committerVinod Koul <vkoul@kernel.org>
Wed, 21 Aug 2019 04:11:28 +0000 (09:41 +0530)
For better maintenance split OF helpers to the separate module.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190820131546.75744-11-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/dw/Makefile
drivers/dma/dw/internal.h
drivers/dma/dw/of.c [new file with mode: 0644]
drivers/dma/dw/platform.c

index 5e69815f3cf1195863baaaf3826e3b90283eded1..b6f06699e91a9d6a8159d407dc1861ac59b50424 100644 (file)
@@ -5,6 +5,7 @@ dw_dmac_core-objs       := core.o dw.o idma32.o
 obj-$(CONFIG_DW_DMAC)          += dw_dmac.o
 dw_dmac-y                      := platform.o
 dw_dmac-$(CONFIG_ACPI)         += acpi.o
+dw_dmac-$(CONFIG_OF)           += of.o
 
 obj-$(CONFIG_DW_DMAC_PCI)      += dw_dmac_pci.o
 dw_dmac_pci-objs       := pci.o
index acada530aa967ac3e802c3f3e083c0220627d7ab..2e1c52eefdeb44d4cac97f75d6418cd437d777c9 100644 (file)
@@ -31,6 +31,21 @@ static inline void dw_dma_acpi_controller_register(struct dw_dma *dw) {}
 static inline void dw_dma_acpi_controller_free(struct dw_dma *dw) {}
 #endif /* !CONFIG_ACPI */
 
+struct platform_device;
+
+#ifdef CONFIG_OF
+struct dw_dma_platform_data *dw_dma_parse_dt(struct platform_device *pdev);
+void dw_dma_of_controller_register(struct dw_dma *dw);
+void dw_dma_of_controller_free(struct dw_dma *dw);
+#else
+static inline struct dw_dma_platform_data *dw_dma_parse_dt(struct platform_device *pdev)
+{
+       return NULL;
+}
+static inline void dw_dma_of_controller_register(struct dw_dma *dw) {}
+static inline void dw_dma_of_controller_free(struct dw_dma *dw) {}
+#endif
+
 struct dw_dma_chip_pdata {
        const struct dw_dma_platform_data *pdata;
        int (*probe)(struct dw_dma_chip *chip);
diff --git a/drivers/dma/dw/of.c b/drivers/dma/dw/of.c
new file mode 100644 (file)
index 0000000..9e27831
--- /dev/null
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Platform driver for the Synopsys DesignWare DMA Controller
+ *
+ * Copyright (C) 2007-2008 Atmel Corporation
+ * Copyright (C) 2010-2011 ST Microelectronics
+ * Copyright (C) 2013 Intel Corporation
+ */
+
+#include <linux/of.h>
+#include <linux/of_dma.h>
+#include <linux/platform_device.h>
+
+#include "internal.h"
+
+static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
+                                       struct of_dma *ofdma)
+{
+       struct dw_dma *dw = ofdma->of_dma_data;
+       struct dw_dma_slave slave = {
+               .dma_dev = dw->dma.dev,
+       };
+       dma_cap_mask_t cap;
+
+       if (dma_spec->args_count != 3)
+               return NULL;
+
+       slave.src_id = dma_spec->args[0];
+       slave.dst_id = dma_spec->args[0];
+       slave.m_master = dma_spec->args[1];
+       slave.p_master = dma_spec->args[2];
+
+       if (WARN_ON(slave.src_id >= DW_DMA_MAX_NR_REQUESTS ||
+                   slave.dst_id >= DW_DMA_MAX_NR_REQUESTS ||
+                   slave.m_master >= dw->pdata->nr_masters ||
+                   slave.p_master >= dw->pdata->nr_masters))
+               return NULL;
+
+       dma_cap_zero(cap);
+       dma_cap_set(DMA_SLAVE, cap);
+
+       /* TODO: there should be a simpler way to do this */
+       return dma_request_channel(cap, dw_dma_filter, &slave);
+}
+
+struct dw_dma_platform_data *dw_dma_parse_dt(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       struct dw_dma_platform_data *pdata;
+       u32 tmp, arr[DW_DMA_MAX_NR_MASTERS], mb[DW_DMA_MAX_NR_CHANNELS];
+       u32 nr_masters;
+       u32 nr_channels;
+
+       if (!np) {
+               dev_err(&pdev->dev, "Missing DT data\n");
+               return NULL;
+       }
+
+       if (of_property_read_u32(np, "dma-masters", &nr_masters))
+               return NULL;
+       if (nr_masters < 1 || nr_masters > DW_DMA_MAX_NR_MASTERS)
+               return NULL;
+
+       if (of_property_read_u32(np, "dma-channels", &nr_channels))
+               return NULL;
+       if (nr_channels > DW_DMA_MAX_NR_CHANNELS)
+               return NULL;
+
+       pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
+               return NULL;
+
+       pdata->nr_masters = nr_masters;
+       pdata->nr_channels = nr_channels;
+
+       if (!of_property_read_u32(np, "chan_allocation_order", &tmp))
+               pdata->chan_allocation_order = (unsigned char)tmp;
+
+       if (!of_property_read_u32(np, "chan_priority", &tmp))
+               pdata->chan_priority = tmp;
+
+       if (!of_property_read_u32(np, "block_size", &tmp))
+               pdata->block_size = tmp;
+
+       if (!of_property_read_u32_array(np, "data-width", arr, nr_masters)) {
+               for (tmp = 0; tmp < nr_masters; tmp++)
+                       pdata->data_width[tmp] = arr[tmp];
+       } else if (!of_property_read_u32_array(np, "data_width", arr, nr_masters)) {
+               for (tmp = 0; tmp < nr_masters; tmp++)
+                       pdata->data_width[tmp] = BIT(arr[tmp] & 0x07);
+       }
+
+       if (!of_property_read_u32_array(np, "multi-block", mb, nr_channels)) {
+               for (tmp = 0; tmp < nr_channels; tmp++)
+                       pdata->multi_block[tmp] = mb[tmp];
+       } else {
+               for (tmp = 0; tmp < nr_channels; tmp++)
+                       pdata->multi_block[tmp] = 1;
+       }
+
+       if (!of_property_read_u32(np, "snps,dma-protection-control", &tmp)) {
+               if (tmp > CHAN_PROTCTL_MASK)
+                       return NULL;
+               pdata->protctl = tmp;
+       }
+
+       return pdata;
+}
+
+void dw_dma_of_controller_register(struct dw_dma *dw)
+{
+       struct device *dev = dw->dma.dev;
+       int ret;
+
+       if (!dev->of_node)
+               return;
+
+       ret = of_dma_controller_register(dev->of_node, dw_dma_of_xlate, dw);
+       if (ret)
+               dev_err(dev, "could not register of_dma_controller\n");
+}
+
+void dw_dma_of_controller_free(struct dw_dma *dw)
+{
+       struct device *dev = dw->dma.dev;
+
+       if (!dev->of_node)
+               return;
+
+       of_dma_controller_free(dev->of_node);
+}
index d50e038acb1e1e6d8a297071010015d3cfdcc180..c90c798e5ec347f8b2ddf4dbb4a6bd650834d46b 100644 (file)
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
-#include <linux/of_dma.h>
 #include <linux/acpi.h>
 
 #include "internal.h"
 
 #define DRV_NAME       "dw_dmac"
 
-static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
-                                       struct of_dma *ofdma)
-{
-       struct dw_dma *dw = ofdma->of_dma_data;
-       struct dw_dma_slave slave = {
-               .dma_dev = dw->dma.dev,
-       };
-       dma_cap_mask_t cap;
-
-       if (dma_spec->args_count != 3)
-               return NULL;
-
-       slave.src_id = dma_spec->args[0];
-       slave.dst_id = dma_spec->args[0];
-       slave.m_master = dma_spec->args[1];
-       slave.p_master = dma_spec->args[2];
-
-       if (WARN_ON(slave.src_id >= DW_DMA_MAX_NR_REQUESTS ||
-                   slave.dst_id >= DW_DMA_MAX_NR_REQUESTS ||
-                   slave.m_master >= dw->pdata->nr_masters ||
-                   slave.p_master >= dw->pdata->nr_masters))
-               return NULL;
-
-       dma_cap_zero(cap);
-       dma_cap_set(DMA_SLAVE, cap);
-
-       /* TODO: there should be a simpler way to do this */
-       return dma_request_channel(cap, dw_dma_filter, &slave);
-}
-
-#ifdef CONFIG_OF
-static struct dw_dma_platform_data *
-dw_dma_parse_dt(struct platform_device *pdev)
-{
-       struct device_node *np = pdev->dev.of_node;
-       struct dw_dma_platform_data *pdata;
-       u32 tmp, arr[DW_DMA_MAX_NR_MASTERS], mb[DW_DMA_MAX_NR_CHANNELS];
-       u32 nr_masters;
-       u32 nr_channels;
-
-       if (!np) {
-               dev_err(&pdev->dev, "Missing DT data\n");
-               return NULL;
-       }
-
-       if (of_property_read_u32(np, "dma-masters", &nr_masters))
-               return NULL;
-       if (nr_masters < 1 || nr_masters > DW_DMA_MAX_NR_MASTERS)
-               return NULL;
-
-       if (of_property_read_u32(np, "dma-channels", &nr_channels))
-               return NULL;
-       if (nr_channels > DW_DMA_MAX_NR_CHANNELS)
-               return NULL;
-
-       pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-       if (!pdata)
-               return NULL;
-
-       pdata->nr_masters = nr_masters;
-       pdata->nr_channels = nr_channels;
-
-       if (!of_property_read_u32(np, "chan_allocation_order", &tmp))
-               pdata->chan_allocation_order = (unsigned char)tmp;
-
-       if (!of_property_read_u32(np, "chan_priority", &tmp))
-               pdata->chan_priority = tmp;
-
-       if (!of_property_read_u32(np, "block_size", &tmp))
-               pdata->block_size = tmp;
-
-       if (!of_property_read_u32_array(np, "data-width", arr, nr_masters)) {
-               for (tmp = 0; tmp < nr_masters; tmp++)
-                       pdata->data_width[tmp] = arr[tmp];
-       } else if (!of_property_read_u32_array(np, "data_width", arr, nr_masters)) {
-               for (tmp = 0; tmp < nr_masters; tmp++)
-                       pdata->data_width[tmp] = BIT(arr[tmp] & 0x07);
-       }
-
-       if (!of_property_read_u32_array(np, "multi-block", mb, nr_channels)) {
-               for (tmp = 0; tmp < nr_channels; tmp++)
-                       pdata->multi_block[tmp] = mb[tmp];
-       } else {
-               for (tmp = 0; tmp < nr_channels; tmp++)
-                       pdata->multi_block[tmp] = 1;
-       }
-
-       if (!of_property_read_u32(np, "snps,dma-protection-control", &tmp)) {
-               if (tmp > CHAN_PROTCTL_MASK)
-                       return NULL;
-               pdata->protctl = tmp;
-       }
-
-       return pdata;
-}
-#else
-static inline struct dw_dma_platform_data *
-dw_dma_parse_dt(struct platform_device *pdev)
-{
-       return NULL;
-}
-#endif
-
 static int dw_probe(struct platform_device *pdev)
 {
        const struct dw_dma_chip_pdata *match;
@@ -185,13 +81,7 @@ static int dw_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, data);
 
-       if (pdev->dev.of_node) {
-               err = of_dma_controller_register(pdev->dev.of_node,
-                                                dw_dma_of_xlate, chip->dw);
-               if (err)
-                       dev_err(&pdev->dev,
-                               "could not register of_dma_controller\n");
-       }
+       dw_dma_of_controller_register(chip->dw);
 
        dw_dma_acpi_controller_register(chip->dw);
 
@@ -211,8 +101,7 @@ static int dw_remove(struct platform_device *pdev)
 
        dw_dma_acpi_controller_free(chip->dw);
 
-       if (pdev->dev.of_node)
-               of_dma_controller_free(pdev->dev.of_node);
+       dw_dma_of_controller_free(chip->dw);
 
        ret = data->remove(chip);
        if (ret)