github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: rockchip: isp: fix isp32 lite mainpath switch fail

Browse Source 
Change-Id: I90f65bd537721c62508f67f16db85ec6b8751ce7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei 2023-03-10 09:02:13 +08:00
parent dd8a854160
commit 09137a828c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/rockchip/isp/csi.c
View File

@ -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;

1
drivers/media/platform/rockchip/isp/regs_v3x.h
View File

@ -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)