From 9fd395b05bf277a9b5a2ded0d886f2b0ce49df97 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Apr 2012 19:24:38 +0800 Subject: [PATCH] camera rk30 : supplement fo this commit 'fix bug of erro format register setted.' --- drivers/media/video/rk30_camera_oneframe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 drivers/media/video/rk30_camera_oneframe.c diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c old mode 100644 new mode 100755 index d0a4022459b5..d0e611457530 --- a/drivers/media/video/rk30_camera_oneframe.c +++ b/drivers/media/video/rk30_camera_oneframe.c @@ -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; -- 2.34.1