diff options
| author |  Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
| 2020-08-15 12:37:22 +0200 |
|---|---|---|
| committer |  Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| 2020-08-29 08:32:14 +0200 |
| commit | fb4ca983adafd6bba385386d24ba21295dbafe42 (patch) | |
| tree | 865e8aba2d65b570577bfd087b908aa9f16e2ae3 /drivers/staging | |
| parent | media: staging: rkisp1: call params isr only upon frame out (diff) | |
| download | linux-fb4ca983adafd6bba385386d24ba21295dbafe42.tar.gz linux-fb4ca983adafd6bba385386d24ba21295dbafe42.tar.bz2 linux-fb4ca983adafd6bba385386d24ba21295dbafe42.zip | |
media: staging: rkisp1: params: use rkisp1_param_set_bits to set reg in isr
replace a read and write of RKISP1_CIF_ISP_CTRL register
in the isr with the 'rkisp1_param_set_bits' function
that does that.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-params.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index fd870b6ae707..fcd1641abba4 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -1191,7 +1191,6 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1) struct rkisp1_params *params = &rkisp1->params; struct rkisp1_params_cfg *new_params; struct rkisp1_buffer *cur_buf = NULL; - u32 isp_ctrl; spin_lock(¶ms->config_lock); if (!params->is_streaming) { @@ -1214,9 +1213,7 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1) rkisp1_isp_isr_meas_config(params, new_params); /* update shadow register immediately */ - isp_ctrl = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_CTRL); - isp_ctrl |= RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD; - rkisp1_write(params->rkisp1, isp_ctrl, RKISP1_CIF_ISP_CTRL); + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD); spin_lock(¶ms->config_lock); list_del(&cur_buf->queue); |