1 files changed, 22 insertions, 18 deletions

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index 26edbe3a27ac..5bda0eb9f393 100644
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -42,13 +42,13 @@ static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
 
         slave.src_id = dma_spec->args[0];
         slave.dst_id = dma_spec->args[0];
-        slave.src_master = dma_spec->args[1];
-        slave.dst_master = dma_spec->args[2];
+        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.src_master >= dw->nr_masters ||
-                    slave.dst_master >= dw->nr_masters))
+                    slave.m_master >= dw->pdata->nr_masters ||
+                    slave.p_master >= dw->pdata->nr_masters))
                 return NULL;
 
         dma_cap_zero(cap);
@@ -66,8 +66,8 @@ static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param)
                 .dma_dev = dma_spec->dev,
                 .src_id = dma_spec->slave_id,
                 .dst_id = dma_spec->slave_id,
-                .src_master = 1,
-                .dst_master = 0,
+                .m_master = 0,
+                .p_master = 1,
         };
 
         return dw_dma_filter(chan, &slave);
@@ -103,6 +103,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 nr_masters;
         u32 nr_channels;
 
         if (!np) {
@@ -110,6 +111,11 @@ dw_dma_parse_dt(struct platform_device *pdev)
                 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;
 
@@ -117,6 +123,7 @@ dw_dma_parse_dt(struct platform_device *pdev)
         if (!pdata)
                 return NULL;
 
+        pdata->nr_masters = nr_masters;
         pdata->nr_channels = nr_channels;
 
         if (of_property_read_bool(np, "is_private"))
@@ -131,17 +138,13 @@ dw_dma_parse_dt(struct platform_device *pdev)
         if (!of_property_read_u32(np, "block_size", &tmp))
                 pdata->block_size = tmp;
 
-        if (!of_property_read_u32(np, "dma-masters", &tmp)) {
-                if (tmp > DW_DMA_MAX_NR_MASTERS)
-                        return NULL;
-
-                pdata->nr_masters = tmp;
-        }
-
-        if (!of_property_read_u32_array(np, "data_width", arr,
-                                pdata->nr_masters))
-                for (tmp = 0; tmp < pdata->nr_masters; 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);
+        }
 
         return pdata;
 }
@@ -158,7 +161,7 @@ static int dw_probe(struct platform_device *pdev)
         struct dw_dma_chip *chip;
         struct device *dev = &pdev->dev;
         struct resource *mem;
-        struct dw_dma_platform_data *pdata;
+        const struct dw_dma_platform_data *pdata;
         int err;
 
         chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
@@ -183,6 +186,7 @@ static int dw_probe(struct platform_device *pdev)
                 pdata = dw_dma_parse_dt(pdev);
 
         chip->dev = dev;
+        chip->pdata = pdata;
 
         chip->clk = devm_clk_get(chip->dev, "hclk");
         if (IS_ERR(chip->clk))
@@ -193,7 +197,7 @@ static int dw_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        err = dw_dma_probe(chip, pdata);
+        err = dw_dma_probe(chip);
         if (err)
                 goto err_dw_dma_probe;