From 79b33b499e5eb22b58611f2eb19948c7cdc9d307 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Fri, 17 Sep 2021 09:39:38 +0800 Subject: [PATCH] media: rockchip: isp: fix input crop config for isp21 multi device Change-Id: I6185273f8474e151ee26c938b8825af383fb73e3 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/rkisp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c index e3dc1859f0b0..c326e87ebbee 100644 --- a/drivers/media/platform/rockchip/isp/rkisp.c +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -566,9 +566,10 @@ void rkisp_trigger_read_back(struct rkisp_device *dev, u8 dma2frm, u32 mode, boo rkisp_set_bits(dev, MI_WR_CTRL2, 0, val, true); rkisp_write(dev, MI_WR_INIT, ISP21_SP_FORCE_UPD | ISP21_MP_FORCE_UPD, true); /* sensor mode & index */ - rkisp_set_bits(dev, ISP_ACQ_H_OFFS, ISP21_SENSOR_MODE(3) | ISP21_SENSOR_INDEX(3), - ISP21_SENSOR_MODE(hw->dev_num >= 3 ? 2 : hw->dev_num - 1) | - ISP21_SENSOR_INDEX(dev->dev_id), true); + val = rkisp_read_reg_cache(dev, ISP_ACQ_H_OFFS); + val |= ISP21_SENSOR_MODE(hw->dev_num >= 3 ? 2 : hw->dev_num - 1) | + ISP21_SENSOR_INDEX(dev->dev_id); + writel(val, hw->base_addr + ISP_ACQ_H_OFFS); } is_upd = true; }