aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-05-15 05:52:01 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-04 05:12:12 -0400
commitfd59f9e6abf2ebf0098c616e1742168db4360d13 (patch)
tree1ba336a7af369ab8263a7beb3c9869631fd11076 /drivers/dma
parent0117f7c7a3e8cdf72bea7d463b142db35e9c9cdc (diff)
dmaengine: ste_dma40: Fetch the number of physical channels from DT
Some platforms insist on obscure physical channel availability. This information is currently passed though platform data in internal BSP kernels. Once those platforms land, they'll need to configure them appropriately, so we may as well add the infrastructure. Cc: Dan Williams <djbw@fb.com> Cc: Per Forlin <per.forlin@stericsson.com> Cc: Rabin Vincent <rabin@rab.in> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ste_dma40.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index ae462d352110..4e528dd30ad5 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -3482,7 +3482,7 @@ static int __init d40_of_probe(struct platform_device *pdev,
3482 struct device_node *np) 3482 struct device_node *np)
3483{ 3483{
3484 struct stedma40_platform_data *pdata; 3484 struct stedma40_platform_data *pdata;
3485 int num_memcpy = 0; 3485 int num_phy = 0, num_memcpy = 0;
3486 const const __be32 *list; 3486 const const __be32 *list;
3487 3487
3488 pdata = devm_kzalloc(&pdev->dev, 3488 pdata = devm_kzalloc(&pdev->dev,
@@ -3491,6 +3491,11 @@ static int __init d40_of_probe(struct platform_device *pdev,
3491 if (!pdata) 3491 if (!pdata)
3492 return -ENOMEM; 3492 return -ENOMEM;
3493 3493
3494 /* If absent this value will be obtained from h/w. */
3495 of_property_read_u32(np, "dma-channels", &num_phy);
3496 if (num_phy > 0)
3497 pdata->num_of_phy_chans = num_phy;
3498
3494 list = of_get_property(np, "memcpy-channels", &num_memcpy); 3499 list = of_get_property(np, "memcpy-channels", &num_memcpy);
3495 num_memcpy /= sizeof(*list); 3500 num_memcpy /= sizeof(*list);
3496 3501