diff options
author | Yuxi Sun <b36102@freescale.com> | 2012-02-08 15:47:51 +0800 |
---|---|---|
committer | Yuxi Sun <b36102@freescale.com> | 2012-02-08 16:37:07 +0800 |
commit | b97af738efa254d96a2a40635e2e711d739b23bc (patch) | |
tree | ea51fbcef15c307672a838da94b46b03f228ab77 /drivers/media/video/mxc/capture/ov5640.c | |
parent | 217f64e3c2b2f8a50c99fd9509eb551efe480129 (diff) |
ENGR00174039 camera: modify camera drivers
Modify ov3640 ov5640 ov5642 driver according to sensor data structure
change for dual camera switch
Signed-off-by: Yuxi Sun <b36102@freescale.com>
Diffstat (limited to 'drivers/media/video/mxc/capture/ov5640.c')
-rw-r--r-- | drivers/media/video/mxc/capture/ov5640.c | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/drivers/media/video/mxc/capture/ov5640.c b/drivers/media/video/mxc/capture/ov5640.c index 64ee178f2e58..f9087499b5f1 100644 --- a/drivers/media/video/mxc/capture/ov5640.c +++ b/drivers/media/video/mxc/capture/ov5640.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -78,27 +78,7 @@ struct ov5640_mode_info { /*! * Maintains the information on the current state of the sesor. */ -struct sensor { - const struct ov5640_platform_data *platform_data; - struct v4l2_int_device *v4l2_int_device; - struct i2c_client *i2c_client; - struct v4l2_pix_format pix; - struct v4l2_captureparm streamcap; - bool on; - - /* control settings */ - int brightness; - int hue; - int contrast; - int saturation; - int red; - int green; - int blue; - int ae_mode; - - u32 mclk; - int csi; -} ov5640_data; +struct sensor_data ov5640_data; static struct reg_value ov5640_setting_15fps_QSXGA_2592_1944[] = { {0x3103, 0x11, 0, 0}, {0x3008, 0x82, 0, 0}, {0x3008, 0x42, 0, 0}, @@ -960,7 +940,7 @@ static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p) */ static int ioctl_s_power(struct v4l2_int_device *s, int on) { - struct sensor *sensor = s->priv; + struct sensor_data *sensor = s->priv; if (on && !sensor->on) { if (io_regulator) @@ -988,7 +968,10 @@ static int ioctl_s_power(struct v4l2_int_device *s, int on) regulator_disable(io_regulator); if (gpo_regulator) regulator_disable(gpo_regulator); - } + + if (camera_plat->pwdn) + camera_plat->pwdn(1); +} sensor->on = on; @@ -1004,7 +987,7 @@ static int ioctl_s_power(struct v4l2_int_device *s, int on) */ static int ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) { - struct sensor *sensor = s->priv; + struct sensor_data *sensor = s->priv; struct v4l2_captureparm *cparm = &a->parm.capture; int ret = 0; @@ -1049,7 +1032,7 @@ static int ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) */ static int ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) { - struct sensor *sensor = s->priv; + struct sensor_data *sensor = s->priv; struct v4l2_fract *timeperframe = &a->parm.capture.timeperframe; u32 tgt_fps; /* target frames per secound */ enum ov5640_frame_rate frame_rate; @@ -1133,7 +1116,7 @@ static int ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) */ static int ioctl_g_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) { - struct sensor *sensor = s->priv; + struct sensor_data *sensor = s->priv; f->fmt.pix = sensor->pix; @@ -1312,7 +1295,7 @@ static int ioctl_enum_fmt_cap(struct v4l2_int_device *s, */ static int ioctl_dev_init(struct v4l2_int_device *s) { - struct sensor *sensor = s->priv; + struct sensor_data *sensor = s->priv; u32 tgt_xclk; /* target xclk */ u32 tgt_fps; /* target frames per secound */ enum ov5640_frame_rate frame_rate; @@ -1415,6 +1398,7 @@ static int ov5640_probe(struct i2c_client *client, ov5640_data.mclk = 24000000; /* 6 - 54 MHz, typical 24MHz */ ov5640_data.mclk = plat_data->mclk; ov5640_data.csi = plat_data->csi; + ov5640_data.io_init = plat_data->io_init; ov5640_data.i2c_client = client; ov5640_data.pix.pixelformat = V4L2_PIX_FMT_YUYV; @@ -1484,9 +1468,6 @@ static int ov5640_probe(struct i2c_client *client, if (plat_data->io_init) plat_data->io_init(); - if (plat_data->pwdn) - plat_data->pwdn(0); - camera_plat = plat_data; ov5640_int_device.priv = &ov5640_data; |