From 5ca69b716802a26c3c03d8d75cabd473c7c9af7e Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Wed, 11 Mar 2020 14:12:18 +0800 Subject: [PATCH] media: rockchip: isp: fix rawnr param error Signed-off-by: Hu Kejun Change-Id: Ic3c37fca818283ae5e717715c97a3e8f508a1e70 --- drivers/media/platform/rockchip/isp/isp_params_v2x.c | 2 +- drivers/media/platform/rockchip/isp/regs_v2x.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c index 48133c762724..eba42c3664ca 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v2x.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -2975,7 +2975,7 @@ isp_rawnr_config(struct rkisp_isp_params_vdev *params_vdev, rkisp_iowrite32(params_vdev, arg->pix_diff, ISP_RAWNR_PIX_DIFF); rkisp_iowrite32(params_vdev, arg->thld_diff, ISP_RAWNR_HILD_DIFF); - value = (arg->gas_weig_scl2 & 0x01) << 24 | + value = (arg->gas_weig_scl2 & 0xFF) << 24 | (arg->gas_weig_scl1 & 0xFF) << 16 | (arg->thld_chanelw & 0x07FF); rkisp_iowrite32(params_vdev, value, ISP_RAWNR_THLD_CHANELW); diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h index bbda9f0ebcd9..91323bda0148 100644 --- a/drivers/media/platform/rockchip/isp/regs_v2x.h +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -833,7 +833,7 @@ #define ISP_HDRTMO_HIST_RO31 (ISP_HDRTMO_BASE + 0x000dc) #define ISP_RAWNR_BASE 0x00003A00 -#define ISP_RAWNR_CTRL (ISP_RAWNR_BASE + 0x00004) +#define ISP_RAWNR_CTRL (ISP_RAWNR_BASE + 0x00000) #define ISP_RAWNR_FILTPAR0 (ISP_RAWNR_BASE + 0x00008) #define ISP_RAWNR_FILTPAR1 (ISP_RAWNR_BASE + 0x0000c) #define ISP_RAWNR_FILTPAR2 (ISP_RAWNR_BASE + 0x00010)