Commit e4fa530f authored Jul 07, 2020 by Dafna Hirschfeld Committed by Mauro Carvalho Chehab Jul 19, 2020

media: staging: rkisp1: remove duplicate macro definition



The macro RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN is defined twice.
Remove the second define.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 1fcc0244

drivers/staging/media/rkisp1/rkisp1-regs.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,6 @@
		#define RKISP1_CIF_ISP_AWB_YMAX_READ(x) (((x) >> 2) & 1)
		#define RKISP1_CIF_ISP_AWB_MODE_RGB_EN ((1 << 31) \| (0x2 << 0))
		#define RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ((0 << 31) \| (0x2 << 0))
		#define RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ((0 << 31) \| (0x2 << 0))
		#define RKISP1_CIF_ISP_AWB_MODE_MASK_NONE 0xFFFFFFFC
		#define RKISP1_CIF_ISP_AWB_MODE_READ(x) ((x) & 3)
		/* ISP_AWB_GAIN_RB, ISP_AWB_GAIN_G */

Admin message