diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2022-05-03 08:51:46 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-05-16 18:34:35 +0530 |
| commit | d84c3ad998795503379ef8458ffffb5c06d18cc5 (patch) | |
| tree | fbf0e57502058452468cae3c99351172e75ebba9 /drivers/dma/sprd-dma.c | |
| parent | 54326f37ec134c138dad4ae33bea048b0b186dd3 (diff) | |
| download | linux-d84c3ad998795503379ef8458ffffb5c06d18cc5.tar.bz2 | |
dmaengine: sprd: deprecate '#dma-channels'
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>
Diffstat (limited to 'drivers/dma/sprd-dma.c')
| -rw-r--r-- | drivers/dma/sprd-dma.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index 7f158ef5672d..2138b80435ab 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -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; |