shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix isp39 no output

Browse Source 
Change-Id: Ifd64690705d21cd70f3bd1dd0a81bc18ee2eb796
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2024-10-22 09:09:24 +08:00
committed by Tao Huang
parent c65d2fce11
commit 22ff58327e
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/rockchip/isp/hw.c
View File

@@ -1068,6 +1068,9 @@ static void isp_config_clk(struct rkisp_hw_dev *dev, int on)
if ((dev->isp_ver == ISP_V20 || dev->isp_ver == ISP_V30) && on)
val |= CLK_CTRL_ISP_3A | CLK_CTRL_ISP_RAW;
/* fix mi and scale on-off no output for isp39 */
if (dev->isp_ver == ISP_V39 && on)
val |= ISP3X_CLK_RSZM | ISP3X_CLK_RSZS;
if (dev->isp_ver == ISP_V32)
rv1106_sdmmc_get_lock();
writel(val, dev->base_addr + CTRL_VI_ISP_CLK_CTRL);

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

@@ -2390,6 +2390,10 @@
/* VI_ICCL */
#define ISP32_BRSZ_CLK_ENABLE BIT(13)
/* VI_ISP_CLK_CTRL */
#define ISP3X_CLK_RSZM BIT(26)
#define ISP3X_CLK_RSZS BIT(29)
/* SWS_CFG */
#define ISP32L_ISP2ENC_CNT_MUX BIT(0)
#define ISP3X_SW_ACK_FRM_PRO_DIS BIT(3)