dmaengine: ti: deprecate '#dma-channels'
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 27 Apr 2022 16:11:23 +0000 (18:11 +0200)
committerVinod Koul <vkoul@kernel.org>
Thu, 19 May 2022 17:28:02 +0000 (22:58 +0530)
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>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20220427161126.647073-4-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/ti/cppi41.c

index 062bd9b..695915d 100644 (file)
@@ -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;