From 09137a828c1b2ae22508c0c519c8bdfd697244f0 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Fri, 10 Mar 2023 09:02:13 +0800 Subject: [PATCH] media: rockchip: isp: fix isp32 lite mainpath switch fail Change-Id: I90f65bd537721c62508f67f16db85ec6b8751ce7 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/csi.c | 5 ++++- drivers/media/platform/rockchip/isp/regs_v3x.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/isp/csi.c b/drivers/media/platform/rockchip/isp/csi.c index 4e7d28f3fe67..cb64f02110a0 100644 --- a/drivers/media/platform/rockchip/isp/csi.c +++ b/drivers/media/platform/rockchip/isp/csi.c @@ -666,7 +666,10 @@ int rkisp_csi_config_patch(struct rkisp_device *dev) if (dev->isp_ver >= ISP_V30) rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, ISP3X_SW_ACK_FRM_PRO_DIS, true, dev->hw_dev->is_unite); - + /* line counter from isp out, default from mp out */ + if (dev->isp_ver == ISP_V32_L) + rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, ISP32L_ISP2ENC_CNT_MUX, + true, dev->hw_dev->is_unite); dev->rdbk_cnt = -1; dev->rdbk_cnt_x1 = -1; dev->rdbk_cnt_x2 = -1; diff --git a/drivers/media/platform/rockchip/isp/regs_v3x.h b/drivers/media/platform/rockchip/isp/regs_v3x.h index 60ab10e66291..b9e8b424c2fd 100644 --- a/drivers/media/platform/rockchip/isp/regs_v3x.h +++ b/drivers/media/platform/rockchip/isp/regs_v3x.h @@ -1870,6 +1870,7 @@ #define ISP32_BRSZ_CLK_ENABLE BIT(13) /* SWS_CFG */ +#define ISP32L_ISP2ENC_CNT_MUX BIT(0) #define ISP3X_SW_ACK_FRM_PRO_DIS BIT(3) #define ISP3X_3A_DDR_WRITE_EN BIT(24) #define ISP3X_SW_MIPI2ISP_FIFO_DIS BIT(25)