UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: omap4iss: ipipeif: Shift input data according to the input format 

Input samples must be left-aligned on the ISIF 16-bit data bus.
Configure the 16-to-16-bit selector to shift data according to the input
format.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Laurent Pinchart 2013-08-30 19:23:31 -03:00 committed by Mauro Carvalho Chehab
parent 74536b2ff0
commit 86efc50432
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/omap4iss/iss_ipipeif.c
View File

@ -129,6 +129,7 @@ static void ipipeif_set_outaddr(struct iss_ipipeif_device *ipipeif, u32 addr)
static void ipipeif_configure(struct iss_ipipeif_device *ipipeif) static void ipipeif_configure(struct iss_ipipeif_device *ipipeif)
{ {
struct iss_device *iss = to_iss_device(ipipeif); struct iss_device *iss = to_iss_device(ipipeif);
const struct iss_format_info *info;
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
u32 isif_ccolp = 0; u32 isif_ccolp = 0;
@ -194,9 +195,10 @@ cont_raw:
ISIF_MODESET_INPMOD_RAW | ISIF_MODESET_CCDW_2BIT, ISIF_MODESET_INPMOD_RAW | ISIF_MODESET_CCDW_2BIT,
iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET); iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_MODESET);
info = omap4iss_video_format_info(format->code);
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD) & writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD) &
~ISIF_CGAMMAWD_GWDI_MASK) | ~ISIF_CGAMMAWD_GWDI_MASK) |
ISIF_CGAMMAWD_GWDI_BIT11, ISIF_CGAMMAWD_GWDI(info->bpp),
iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD); iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_CGAMMAWD);
/* Set RAW Bayer pattern */ /* Set RAW Bayer pattern */

2
drivers/staging/media/omap4iss/iss_regs.h
View File

@ -368,7 +368,7 @@
#define ISIF_CGAMMAWD (0x0080) #define ISIF_CGAMMAWD (0x0080)
#define ISIF_CGAMMAWD_GWDI_MASK (0xF << 1) #define ISIF_CGAMMAWD_GWDI_MASK (0xF << 1)
#define ISIF_CGAMMAWD_GWDI_BIT11 (0x4 << 1) #define ISIF_CGAMMAWD_GWDI(bpp) ((16 - (bpp)) << 1)
#define ISIF_CCDCFG (0x0088) #define ISIF_CCDCFG (0x0088)
#define ISIF_CCDCFG_Y8POS (1 << 11) #define ISIF_CCDCFG_Y8POS (1 << 11)