diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2022-05-03 08:54:05 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-05-19 22:53:46 +0530 |
| commit | d9cb0a4c0be595b55e30cf8774d3e92ab38bca5b (patch) | |
| tree | eaf8f86a4205ebe78f3c4ed963cf953392e086ae /drivers/dma | |
| parent | bd1eca7b2c66c53873a0eab84f9f301aca41f33a (diff) | |
| download | linux-stable-d9cb0a4c0be595b55e30cf8774d3e92ab38bca5b.tar.gz linux-stable-d9cb0a4c0be595b55e30cf8774d3e92ab38bca5b.tar.bz2 linux-stable-d9cb0a4c0be595b55e30cf8774d3e92ab38bca5b.zip | |
dmaengine: pxa: deprecate '#dma-channels' and '#dma-requests'
The generic properties, used in most of the drivers and defined in
generic dma-common DT bindings, are 'dma-channels' and 'dma-requests'.
Switch to new properties while keeping backward compatibility.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220503065407.52188-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/pxa_dma.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 6078cc81892e..e7034f6f3994 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -1365,10 +1365,17 @@ static int pxad_probe(struct platform_device *op) of_id = of_match_device(pxad_dt_ids, &op->dev); if (of_id) { - of_property_read_u32(op->dev.of_node, "#dma-channels", - &dma_channels); - ret = of_property_read_u32(op->dev.of_node, "#dma-requests", + /* Parse new and deprecated dma-channels properties */ + if (of_property_read_u32(op->dev.of_node, "dma-channels", + &dma_channels)) + of_property_read_u32(op->dev.of_node, "#dma-channels", + &dma_channels); + /* Parse new and deprecated dma-requests properties */ + ret = of_property_read_u32(op->dev.of_node, "dma-requests", &nb_requestors); + if (ret) + ret = of_property_read_u32(op->dev.of_node, "#dma-requests", + &nb_requestors); if (ret) { dev_warn(pdev->slave.dev, "#dma-requests set to default 32 as missing in OF: %d", |