2022-05-03 07:03:37

by Krzysztof Kozlowski

Subject: [PATCH v2 2/3] 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 <[email protected]>
---
drivers/dma/sprd-dma.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

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;
--
2.32.0

2022-05-04 11:26:25

by Baolin Wang

Subject: Re: [PATCH v2 2/3] dmaengine: sprd: deprecate '#dma-channels'

On Tue, May 3, 2022 at 2:51 PM Krzysztof Kozlowski
<[email protected]> 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.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Thanks.
Reviewed-by: Baolin Wang <[email protected]>

> ---
> drivers/dma/sprd-dma.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> 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;
> --
> 2.32.0
>


--
Baolin Wang