dmaengine: sprd: deprecate '#dma-channels'
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tue, 3 May 2022 06:51:46 +0000 (08:51 +0200)
committerVinod Koul <vkoul@kernel.org>
Mon, 16 May 2022 13:04:35 +0000 (18:34 +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: Baolin Wang <baolin.wang7@gmail.com>
Link: https://lore.kernel.org/r/20220503065147.51728-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/sprd-dma.c

index 7f158ef..2138b80 100644 (file)
@@ -1117,7 +1117,11 @@ static int sprd_dma_probe(struct platform_device *pdev)
        u32 chn_count;
        int ret, i;
 
-       ret = device_property_read_u32(&pdev->dev, "#dma-channels", &chn_count);
+       /* Parse new and deprecated dma-channels properties */
+       ret = device_property_read_u32(&pdev->dev, "dma-channels", &chn_count);
+       if (ret)
+               ret = device_property_read_u32(&pdev->dev, "#dma-channels",
+                                              &chn_count);
        if (ret) {
                dev_err(&pdev->dev, "get dma channels count failed\n");
                return ret;