| From 4df2e189033ee6b474a2a1589a6041644c0f9915 Mon Sep 17 00:00:00 2001 |
| From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
| Date: Wed, 28 Jan 2015 22:53:53 -0200 |
| Subject: [PATCH 258/326] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro |
| |
| 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> |
| (cherry picked from commit 03b36e4dcf422a10da8b67bce2ed00b34ec58aac) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/media/platform/vsp1/vsp1_regs.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h |
| index da3c573e1efc..f61e1096f9fc 100644 |
| --- a/drivers/media/platform/vsp1/vsp1_regs.h |
| +++ b/drivers/media/platform/vsp1/vsp1_regs.h |
| @@ -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 |
| -- |
| 2.6.2 |
| |
