| Message ID | 20220427161126.647073-4-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a725e582d720066e49034f8980af57a720d75127 |
| Headers | show |
| Series | dmaengine/ARM: use proper 'dma-channels/requests' properties | expand |
* Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> [220427 16:08]: > The generic property, used in most of the drivers and defined in generic > dma-common DT bindings, is 'dma-channels'. Switch to new property while > keeping backward compatibility. Looks good to me: Reviewed-by: Tony Lindgren <tony@atomide.com>
On 27-04-22, 18:11, Krzysztof Kozlowski wrote: > The generic property, used in most of the drivers and defined in generic > dma-common DT bindings, is 'dma-channels'. Switch to new property while > keeping backward compatibility. Applied, thanks
diff --git a/drivers/dma/ti/cppi41.c b/drivers/dma/ti/cppi41.c index 062bd9bd4de0..695915dba707 100644 --- a/drivers/dma/ti/cppi41.c +++ b/drivers/dma/ti/cppi41.c @@ -1105,8 +1105,12 @@ static int cppi41_dma_probe(struct platform_device *pdev) cdd->qmgr_num_pend = glue_info->qmgr_num_pend; cdd->first_completion_queue = glue_info->first_completion_queue; + /* Parse new and deprecated dma-channels properties */ ret = of_property_read_u32(dev->of_node, - "#dma-channels", &cdd->n_chans); + "dma-channels", &cdd->n_chans); + if (ret) + ret = of_property_read_u32(dev->of_node, + "#dma-channels", &cdd->n_chans); if (ret) goto err_get_n_chans;
The generic property, used in most of the drivers and defined in generic dma-common DT bindings, is 'dma-channels'. Switch to new property while keeping backward compatibility. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/dma/ti/cppi41.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)