diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2019-10-01 18:29:27 +0000 |
|---|---|---|
| committer | Qiang Yu <yuq825@gmail.com> | 2019-10-05 17:51:16 +0800 |
| commit | 30abc59b4842511a34d7051a1ac01dc007fa1169 (patch) | |
| tree | fb654f52bc74fe831f798f963042d94c32c5f2e5 | |
| parent | 4f69851fbaa26b155330be35ce8ac393e93e7442 (diff) | |
| download | linux-30abc59b4842511a34d7051a1ac01dc007fa1169.tar.bz2 | |
drm/lima: Add support for multiple reset lines
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 <yuq825@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Cc: lima@lists.freedesktop.org
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191001182927.70448-1-john.stultz@linaro.org
| -rw-r--r-- | drivers/gpu/drm/lima/lima_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |