From 093dfc2f79538eb2b379e41ec303ecc7ea79669d Mon Sep 17 00:00:00 2001 From: ddl Date: Sun, 2 Jan 2011 22:49:06 +0800 Subject: [PATCH] camera: temp version for ces --- arch/arm/mach-rk29/board-rk29sdk.c | 1 + drivers/media/video/ov2659.c | 3 ++- drivers/media/video/ov5642.c | 34 +++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c index 2edc6e2a5a72..f4f484771b39 100755 --- a/arch/arm/mach-rk29/board-rk29sdk.c +++ b/arch/arm/mach-rk29/board-rk29sdk.c @@ -732,6 +732,7 @@ static int rk29_sensor_power(struct device *dev, int on) } else { gpio_set_value(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS)); //printk("\n%s..%s..PowerPin=%d ..PinLevel = %x \n",__FUNCTION__,dev_name(dev), camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS)); + msleep(100); } } diff --git a/drivers/media/video/ov2659.c b/drivers/media/video/ov2659.c index e6eb011eba9c..bf39146dc687 100755 --- a/drivers/media/video/ov2659.c +++ b/drivers/media/video/ov2659.c @@ -54,7 +54,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron #define CONFIG_SENSOR_Mirror 0 #define CONFIG_SENSOR_Flip 0 -#define CONFIG_SENSOR_I2C_SPEED 250000 /* Hz */ +#define CONFIG_SENSOR_I2C_SPEED 100000 /* Hz */ #define CONFIG_SENSOR_TR 1 #define CONFIG_SENSOR_DEBUG 1 @@ -1475,6 +1475,7 @@ static int sensor_deactivate(struct v4l2_subdev *sd) sensor_read(client,0x3002,®_val); sensor_write(client, 0x3002, reg_val&0x1f); + msleep(100); return 0; } diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c index a2636e8bf040..8b7319700a03 100755 --- a/drivers/media/video/ov5642.c +++ b/drivers/media/video/ov5642.c @@ -60,7 +60,7 @@ #define CONFIG_SENSOR_Focus 0 #endif -#define CONFIG_SENSOR_I2C_SPEED 200000 /* Hz */ +#define CONFIG_SENSOR_I2C_SPEED 100000 /* Hz */ #define CONFIG_SENSOR_TR 1 #define CONFIG_SENSOR_DEBUG 1 @@ -2254,6 +2254,7 @@ static struct reginfo sensor_sxga[] = /* 800X600 SVGA*/ static struct reginfo sensor_svga[] = { +#if 0 {0x3000,0xf8}, {0x3001,0x48}, {0x3002,0x5c}, @@ -2317,6 +2318,36 @@ static struct reginfo sensor_svga[] = {0x3002,0x5c}, {0x3503,0x00}, {0x3000,0x00}, +#else + {0x3800 ,0x1 }, + {0x3801 ,0x50}, + {0x3802 ,0x0 }, + {0x3803 ,0x8 }, + {0x3804 ,0x5 }, + {0x3805 ,0x0 }, + {0x3806 ,0x3 }, + {0x3807 ,0xc0}, + {0x3808 ,0x3 }, + {0x3809 ,0x20}, + {0x380a ,0x2 }, + {0x380b ,0x58}, + {0x380c ,0xc }, + {0x380d ,0x80}, + {0x380e ,0x3 }, + {0x380f ,0xe8}, + {0x5001 ,0x7f}, + {0x5680 ,0x0 }, + {0x5681 ,0x0 }, + {0x5682 ,0x5 }, + {0x5683 ,0x0 }, + {0x5684 ,0x0 }, + {0x5685 ,0x0 }, + {0x5686 ,0x3 }, + {0x5687 ,0xc0}, + {0x5687 ,0xc0}, + {0x3815 ,0x02}, + {0x3503 ,0x00}, +#endif {0x0000 ,0x00} }; @@ -3799,6 +3830,7 @@ static int sensor_deactivate(struct v4l2_subdev *sd) sensor_write(client,0x3019,0X00); // STROBE,SDA SENSOR_DG("\n%s..%s exit \n",SENSOR_NAME_STRING(),__FUNCTION__); + msleep(100); return 0; } static struct reginfo sensor_power_down_sequence[]= -- 2.34.1