Merge tag 'modules-for-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / dw / platform.c

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index 5bda0eb9f393f8b25c6bcbe180cbacd675bd8456..b1655e40cfa24f7313e11c49c7394951cda68451 100644 (file)
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -102,7 +102,7 @@ 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];
+       u32 tmp, arr[DW_DMA_MAX_NR_MASTERS], mb[DW_DMA_MAX_NR_CHANNELS];
        u32 nr_masters;
        u32 nr_channels;
 
@@ -118,6 +118,8 @@ dw_dma_parse_dt(struct platform_device *pdev)
 
        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)
@@ -129,6 +131,12 @@ dw_dma_parse_dt(struct platform_device *pdev)
        if (of_property_read_bool(np, "is_private"))
                pdata->is_private = true;
 
+       /*
+        * All known devices, which use DT for configuration, support
+        * memory-to-memory transfers. So enable it by default.
+        */
+       pdata->is_memcpy = true;
+
        if (!of_property_read_u32(np, "chan_allocation_order", &tmp))
                pdata->chan_allocation_order = (unsigned char)tmp;
 
@@ -146,6 +154,14 @@ dw_dma_parse_dt(struct platform_device *pdev)
                        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;
+       }
+
        return pdata;
 }
 #else