Commit 7a278b4c authored Jan 28, 2015 by Nobuhiro Iwamatsu Committed by Sasha Levin Dec 03, 2015

[media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro



[ Upstream commit 03b36e4dcf422a10da8b67bce2ed00b34ec58aac ]

Clipping size bit of VI6_WPFn _HSZCLIP and VI6_WPFn _VSZCLIP register are from
0 bit to 11 bit. But VI6_WPF_SZCLIP_SIZE_MASK is set to 0x1FFF, this will mask
until the reserve bits. This fixes size for VI6_WPF_SZCLIP_SIZE_MASK.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 95121381

drivers/media/platform/vsp1/vsp1_regs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@
		#define VI6_WPF_SZCLIP_EN (1 << 28)
		#define VI6_WPF_SZCLIP_OFST_MASK (0xff << 16)
		#define VI6_WPF_SZCLIP_OFST_SHIFT 16
		#define VI6_WPF_SZCLIP_SIZE_MASK (0x1fff << 0)
		#define VI6_WPF_SZCLIP_SIZE_MASK (0xfff << 0)
		#define VI6_WPF_SZCLIP_SIZE_SHIFT 0

		#define VI6_WPF_OUTFMT 0x100c