shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera rk30 : supplement fo this commit 'fix bug of erro format register setted.'

Browse Source
This commit is contained in:
root
2012-04-17 19:24:38 +08:00
parent 35db0faef7
commit 9fd395b05b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/rk30_camera_oneframe.c Normal file → Executable file
View File

@@ -1077,7 +1077,7 @@ static void rk_camera_setup_format(struct soc_camera_device *icd, __u32 host_pix
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
struct rk_camera_dev *pcdev = ici->priv;
unsigned int cif_fs = 0,cif_crop = 0;
unsigned int cif_fmt_val = INPUT_MODE_YUV|YUV_INPUT_422|INPUT_420_ORDER_EVEN|OUTPUT_420_ORDER_EVEN;
unsigned int cif_fmt_val = read_cif_reg(pcdev->base,CIF_CIF_FOR) | INPUT_MODE_YUV|YUV_INPUT_422|INPUT_420_ORDER_EVEN|OUTPUT_420_ORDER_EVEN;
switch (host_pixfmt)
{
case V4L2_PIX_FMT_NV16:
@@ -1128,7 +1128,7 @@ static void rk_camera_setup_format(struct soc_camera_device *icd, __u32 host_pix
cif_fmt_val = YUV_INPUT_ORDER_YUYV(cif_fmt_val);
break;
}
write_cif_reg(pcdev->base,CIF_CIF_FOR, read_cif_reg(pcdev->base,CIF_CIF_FOR) |cif_fmt_val); /* ddl@rock-chips.com: VIP capture mode and capture format must be set before FS register set */
write_cif_reg(pcdev->base,CIF_CIF_FOR,cif_fmt_val); /* ddl@rock-chips.com: VIP capture mode and capture format must be set before FS register set */
// read_cif_reg(pcdev->base,CIF_CIF_INTSTAT); /* clear vip interrupte single */
write_cif_reg(pcdev->base,CIF_CIF_INTSTAT,0xFFFFFFFF);
@@ -1830,7 +1830,7 @@ static int rk_camera_s_stream(struct soc_camera_device *icd, int enable)
//must be reinit,or will be somthing wrong in irq process.
if(enable == false){
pcdev->active = NULL;
INIT_LIST_HEAD(&pcdev->capture);
INIT_LIST_HEAD(&pcdev->capture);
}
RKCAMERA_DG("%s.. enable : 0x%x , CIF_CIF_CTRL = 0x%x\n", __FUNCTION__, enable,read_cif_reg(pcdev->base,CIF_CIF_CTRL));
return 0;