2019-10-01 18:33:27

by John Stultz

Subject: [PATCH] drm: lima: Add support for multiple reset lines

From: Peter Griffin <[email protected]>

Some SoCs like HiKey have 2 reset lines, so update
to use the devm_reset_control_array_* variant of the
API so that multiple resets can be specified in DT.

Cc: Qiang Yu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Peter Griffin <[email protected]>
Signed-off-by: John Stultz <[email protected]>
---
drivers/gpu/drm/lima/lima_device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c
index d86b8d81a483..e3e0ca11382e 100644
--- a/drivers/gpu/drm/lima/lima_device.c
+++ b/drivers/gpu/drm/lima/lima_device.c
@@ -105,7 +105,8 @@ static int lima_clk_init(struct lima_device *dev)
if (err)
goto error_out0;

- dev->reset = devm_reset_control_get_optional(dev->dev, NULL);
+ dev->reset = devm_reset_control_array_get_optional_shared(dev->dev);
+
if (IS_ERR(dev->reset)) {
err = PTR_ERR(dev->reset);
if (err != -EPROBE_DEFER)
--
2.17.1

2019-10-05 09:31:57

by Qiang Yu

Subject: Re: [PATCH] drm: lima: Add support for multiple reset lines

On Wed, Oct 2, 2019 at 2:29 AM John Stultz <[email protected]> wrote:
>
> From: Peter Griffin <[email protected]>
>
> Some SoCs like HiKey have 2 reset lines, so update
> to use the devm_reset_control_array_* variant of the
> API so that multiple resets can be specified in DT.
>
> Cc: Qiang Yu <[email protected]>
> Cc: David Airlie <[email protected]>
> Cc: Daniel Vetter <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Peter Griffin <[email protected]>
> Signed-off-by: John Stultz <[email protected]>
> ---
> drivers/gpu/drm/lima/lima_device.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c
> index d86b8d81a483..e3e0ca11382e 100644
> --- a/drivers/gpu/drm/lima/lima_device.c
> +++ b/drivers/gpu/drm/lima/lima_device.c
> @@ -105,7 +105,8 @@ static int lima_clk_init(struct lima_device *dev)
> if (err)
> goto error_out0;
>
> - dev->reset = devm_reset_control_get_optional(dev->dev, NULL);
> + dev->reset = devm_reset_control_array_get_optional_shared(dev->dev);
> +
> if (IS_ERR(dev->reset)) {
> err = PTR_ERR(dev->reset);
> if (err != -EPROBE_DEFER)
> --
> 2.17.1
>

Looks good for me, patch is:
Reviewed-by: Qiang Yu <[email protected]>

I'll apply it to drm-misc-next.

Thanks,
Qiang