Hi Phil,
Some quick review notes:
On Mon June 3 2013 11:35:35 Phil Edworthy wrote:
> Signed-off-by: Phil Edworthy <phil.edworthy@xxxxxxxxxxx>
> ---
> drivers/media/i2c/soc_camera/Kconfig | 6 +
> drivers/media/i2c/soc_camera/Makefile | 1 +
> drivers/media/i2c/soc_camera/ov10635.c | 1169 ++++++++++++++++++++++++++++++++
> include/media/v4l2-chip-ident.h | 1 +
> 4 files changed, 1177 insertions(+)
> create mode 100644 drivers/media/i2c/soc_camera/ov10635.c
>
> diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/media/i2c/soc_camera/Kconfig
> index 6dff2b7..0b17296 100644
> --- a/drivers/media/i2c/soc_camera/Kconfig
> +++ b/drivers/media/i2c/soc_camera/Kconfig
> @@ -76,6 +76,12 @@ config SOC_CAMERA_OV9740
> help
> This is a ov9740 camera driver
>
> +config SOC_CAMERA_OV10635
> + tristate "ov10635 camera support"
> + depends on SOC_CAMERA && I2C
> + help
> + This is an OmniVision ov10635 camera driver
> +
> config SOC_CAMERA_RJ54N1
> tristate "rj54n1cb0c support"
> depends on SOC_CAMERA && I2C
> diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/media/i2c/soc_camera/Makefile
> index d0421fe..f3d3403 100644
> --- a/drivers/media/i2c/soc_camera/Makefile
> +++ b/drivers/media/i2c/soc_camera/Makefile
> @@ -10,5 +10,6 @@ obj-$(CONFIG_SOC_CAMERA_OV6650) += ov6650.o
> obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
> obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o
> obj-$(CONFIG_SOC_CAMERA_OV9740) += ov9740.o
> +obj-$(CONFIG_SOC_CAMERA_OV10635) += ov10635.o
> obj-$(CONFIG_SOC_CAMERA_RJ54N1) += rj54n1cb0c.o
> obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o
> diff --git a/drivers/media/i2c/soc_camera/ov10635.c b/drivers/media/i2c/soc_camera/ov10635.c
> new file mode 100644
> index 0000000..82d01b8
> --- /dev/null
> +++ b/drivers/media/i2c/soc_camera/ov10635.c
> @@ -0,0 +1,1169 @@
> +/*
> + * OmniVision OV10635 Camera Driver
> + *
> + * Copyright (C) 2013 Phil Edworthy
> + * Copyright (C) 2013 Renesas Electronics
> + *
> + * This driver has been tested at QVGA, VGA and 720p, and 1280x800 at up to
> + * 30fps and it should work at any resolution in between and any frame rate
> + * up to 30fps.
> + *
> + * FIXME:
> + * Horizontal flip (mirroring) does not work correctly. The image is flipped,
> + * but the colors are wrong.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + */
> +
> +#include <linux/delay.h>
> +#include <linux/i2c.h>
> +#include <linux/init.h>
> +#include <linux/module.h>
> +#include <linux/slab.h>
> +#include <linux/v4l2-mediabus.h>
> +#include <linux/videodev2.h>
> +
> +#include <media/soc_camera.h>
> +#include <media/v4l2-chip-ident.h>
Don't implement chip_ident or use this header: it's going to be removed in 3.11.
> +#include <media/v4l2-common.h>
> +#include <media/v4l2-ctrls.h>
> +
> +/* Register definitions */
> +#define OV10635_VFLIP 0x381c
> +#define OV10635_VFLIP_ON (0x3 << 6)
> +#define OV10635_VFLIP_SUBSAMPLE 0x1
> +#define OV10635_HMIRROR 0x381d
> +#define OV10635_HMIRROR_ON 0x3
> +#define OV10635_PID 0x300a
> +#define OV10635_VER 0x300b
> +
> +/* IDs */
> +#define OV10635_VERSION_REG 0xa635
> +#define OV10635_VERSION(pid, ver) (((pid) << 8) | ((ver) & 0xff))
> +
> +#define OV10635_SENSOR_WIDTH 1312
> +#define OV10635_SENSOR_HEIGHT 814
> +
> +#define OV10635_MAX_WIDTH 1280
> +#define OV10635_MAX_HEIGHT 800
> +
> +struct ov10635_color_format {
> + enum v4l2_mbus_pixelcode code;
> + enum v4l2_colorspace colorspace;
> +};
> +
> +struct ov10635_reg {
> + u16 reg;
> + u8 val;
> +};
> +
> +struct ov10635_priv {
> + struct v4l2_subdev subdev;
> + struct v4l2_ctrl_handler hdl;
> + int model;
> + int revision;
> + int xvclk;
> + int fps_numerator;
> + int fps_denominator;
> + const struct ov10635_color_format *cfmt;
> + int width;
> + int height;
> +};
> +
> +/* default register setup */
> +static const struct ov10635_reg ov10635_regs_default[] = {
> + { 0x0103, 0x01 }, { 0x301b, 0xff }, { 0x301c, 0xff }, { 0x301a, 0xff },
> + { 0x3011, 0x02 }, /* drive strength reduced to x1 */
> + { 0x6900, 0x0c }, { 0x6901, 0x11 }, { 0x3503, 0x10 }, { 0x3025, 0x03 },
> + { 0x3005, 0x20 }, { 0x3006, 0x91 }, { 0x3600, 0x74 }, { 0x3601, 0x2b },
> + { 0x3612, 0x00 }, { 0x3611, 0x67 }, { 0x3633, 0xca }, { 0x3602, 0x2f },
> + { 0x3603, 0x00 }, { 0x3630, 0x28 }, { 0x3631, 0x16 }, { 0x3714, 0x10 },
> + { 0x371d, 0x01 }, { 0x4300, 0x38 }, { 0x3007, 0x01 }, { 0x3024, 0x01 },
> + { 0x3020, 0x0b }, { 0x3702, 0x0d }, { 0x3703, 0x20 }, { 0x3704, 0x15 },
> + { 0x3709, 0xa8 }, { 0x370c, 0xc7 }, { 0x370d, 0x80 }, { 0x3712, 0x00 },
> + { 0x3713, 0x20 }, { 0x3715, 0x04 }, { 0x381d, 0x40 }, { 0x381c, 0x00 },
> + { 0x3822, 0x50 }, { 0x3824, 0x10 }, { 0x3815, 0x8c }, { 0x3804, 0x05 },
> + { 0x3805, 0x1f }, { 0x3800, 0x00 }, { 0x3801, 0x00 }, { 0x3806, 0x02 },
> + { 0x3807, 0xfd }, { 0x3802, 0x00 }, { 0x3803, 0x2c }, { 0x3808, 0x05 },
> + { 0x3809, 0x00 }, { 0x380a, 0x02 }, { 0x380b, 0xd0 }, { 0x380c, 0x06 },
> + { 0x380d, 0xf6 }, { 0x380e, 0x02 }, { 0x380f, 0xec }, { 0x3813, 0x02 },
> + { 0x3811, 0x08 }, { 0x381f, 0x0c }, { 0x3819, 0x04 }, { 0x3804, 0x01 },
> + { 0x3805, 0x00 }, { 0x3828, 0x03 }, { 0x3829, 0x10 }, { 0x382a, 0x10 },
> + { 0x3621, 0x63 }, { 0x5005, 0x08 }, { 0x56d5, 0x00 }, { 0x56d6, 0x80 },
> + { 0x56d7, 0x00 }, { 0x56d8, 0x00 }, { 0x56d9, 0x00 }, { 0x56da, 0x80 },
> + { 0x56db, 0x00 }, { 0x56dc, 0x00 }, { 0x56e8, 0x00 }, { 0x56e9, 0x7f },
> + { 0x56ea, 0x00 }, { 0x56eb, 0x7f }, { 0x5100, 0x00 }, { 0x5101, 0x80 },
> + { 0x5102, 0x00 }, { 0x5103, 0x80 }, { 0x5104, 0x00 }, { 0x5105, 0x80 },
> + { 0x5106, 0x00 }, { 0x5107, 0x80 }, { 0x5108, 0x00 }, { 0x5109, 0x00 },
> + { 0x510a, 0x00 }, { 0x510b, 0x00 }, { 0x510c, 0x00 }, { 0x510d, 0x00 },
> + { 0x510e, 0x00 }, { 0x510f, 0x00 }, { 0x5110, 0x00 }, { 0x5111, 0x80 },
> + { 0x5112, 0x00 }, { 0x5113, 0x80 }, { 0x5114, 0x00 }, { 0x5115, 0x80 },
> + { 0x5116, 0x00 }, { 0x5117, 0x80 }, { 0x5118, 0x00 }, { 0x5119, 0x00 },
> + { 0x511a, 0x00 }, { 0x511b, 0x00 }, { 0x511c, 0x00 }, { 0x511d, 0x00 },
> + { 0x511e, 0x00 }, { 0x511f, 0x00 }, { 0x56d0, 0x00 }, { 0x5006, 0x24 },
> + { 0x5608, 0x0b }, { 0x52d7, 0x06 }, { 0x528d, 0x08 }, { 0x5293, 0x12 },
> + { 0x52d3, 0x12 }, { 0x5288, 0x06 }, { 0x5289, 0x20 }, { 0x52c8, 0x06 },
> + { 0x52c9, 0x20 }, { 0x52cd, 0x04 }, { 0x5381, 0x00 }, { 0x5382, 0xff },
> + { 0x5589, 0x76 }, { 0x558a, 0x47 }, { 0x558b, 0xef }, { 0x558c, 0xc9 },
> + { 0x558d, 0x49 }, { 0x558e, 0x30 }, { 0x558f, 0x67 }, { 0x5590, 0x3f },
> + { 0x5591, 0xf0 }, { 0x5592, 0x10 }, { 0x55a2, 0x6d }, { 0x55a3, 0x55 },
> + { 0x55a4, 0xc3 }, { 0x55a5, 0xb5 }, { 0x55a6, 0x43 }, { 0x55a7, 0x38 },
> + { 0x55a8, 0x5f }, { 0x55a9, 0x4b }, { 0x55aa, 0xf0 }, { 0x55ab, 0x10 },
> + { 0x5581, 0x52 }, { 0x5300, 0x01 }, { 0x5301, 0x00 }, { 0x5302, 0x00 },
> + { 0x5303, 0x0e }, { 0x5304, 0x00 }, { 0x5305, 0x0e }, { 0x5306, 0x00 },
> + { 0x5307, 0x36 }, { 0x5308, 0x00 }, { 0x5309, 0xd9 }, { 0x530a, 0x00 },
> + { 0x530b, 0x0f }, { 0x530c, 0x00 }, { 0x530d, 0x2c }, { 0x530e, 0x00 },
> + { 0x530f, 0x59 }, { 0x5310, 0x00 }, { 0x5311, 0x7b }, { 0x5312, 0x00 },
> + { 0x5313, 0x22 }, { 0x5314, 0x00 }, { 0x5315, 0xd5 }, { 0x5316, 0x00 },
> + { 0x5317, 0x13 }, { 0x5318, 0x00 }, { 0x5319, 0x18 }, { 0x531a, 0x00 },
> + { 0x531b, 0x26 }, { 0x531c, 0x00 }, { 0x531d, 0xdc }, { 0x531e, 0x00 },
> + { 0x531f, 0x02 }, { 0x5320, 0x00 }, { 0x5321, 0x24 }, { 0x5322, 0x00 },
> + { 0x5323, 0x56 }, { 0x5324, 0x00 }, { 0x5325, 0x85 }, { 0x5326, 0x00 },
> + { 0x5327, 0x20 }, { 0x5609, 0x01 }, { 0x560a, 0x40 }, { 0x560b, 0x01 },
> + { 0x560c, 0x40 }, { 0x560d, 0x00 }, { 0x560e, 0xfa }, { 0x560f, 0x00 },
> + { 0x5610, 0xfa }, { 0x5611, 0x02 }, { 0x5612, 0x80 }, { 0x5613, 0x02 },
> + { 0x5614, 0x80 }, { 0x5615, 0x01 }, { 0x5616, 0x2c }, { 0x5617, 0x01 },
> + { 0x5618, 0x2c }, { 0x563b, 0x01 }, { 0x563c, 0x01 }, { 0x563d, 0x01 },
> + { 0x563e, 0x01 }, { 0x563f, 0x03 }, { 0x5640, 0x03 }, { 0x5641, 0x03 },
> + { 0x5642, 0x05 }, { 0x5643, 0x09 }, { 0x5644, 0x05 }, { 0x5645, 0x05 },
> + { 0x5646, 0x05 }, { 0x5647, 0x05 }, { 0x5651, 0x00 }, { 0x5652, 0x80 },
> + { 0x521a, 0x01 }, { 0x521b, 0x03 }, { 0x521c, 0x06 }, { 0x521d, 0x0a },
> + { 0x521e, 0x0e }, { 0x521f, 0x12 }, { 0x5220, 0x16 }, { 0x5223, 0x02 },
> + { 0x5225, 0x04 }, { 0x5227, 0x08 }, { 0x5229, 0x0c }, { 0x522b, 0x12 },
> + { 0x522d, 0x18 }, { 0x522f, 0x1e }, { 0x5241, 0x04 }, { 0x5242, 0x01 },
> + { 0x5243, 0x03 }, { 0x5244, 0x06 }, { 0x5245, 0x0a }, { 0x5246, 0x0e },
> + { 0x5247, 0x12 }, { 0x5248, 0x16 }, { 0x524a, 0x03 }, { 0x524c, 0x04 },
> + { 0x524e, 0x08 }, { 0x5250, 0x0c }, { 0x5252, 0x12 }, { 0x5254, 0x18 },
> + { 0x5256, 0x1e }, { 0x4606, 0x07 }, { 0x4607, 0x71 }, { 0x460a, 0x02 },
> + { 0x460b, 0x70 }, { 0x460c, 0x00 }, { 0x4620, 0x0e }, { 0x4700, 0x04 },
> + { 0x4701, 0x00 }, { 0x4702, 0x01 }, { 0x4004, 0x04 }, { 0x4005, 0x18 },
> + { 0x4001, 0x06 }, { 0x4050, 0x22 }, { 0x4051, 0x24 }, { 0x4052, 0x02 },
> + { 0x4057, 0x9c }, { 0x405a, 0x00 }, { 0x4202, 0x02 }, { 0x3023, 0x10 },
> + { 0x0100, 0x01 }, { 0x0100, 0x01 }, { 0x6f10, 0x07 }, { 0x6f11, 0x82 },
> + { 0x6f12, 0x04 }, { 0x6f13, 0x00 }, { 0xd000, 0x19 }, { 0xd001, 0xa0 },
> + { 0xd002, 0x00 }, { 0xd003, 0x01 }, { 0xd004, 0xa9 }, { 0xd005, 0xad },
> + { 0xd006, 0x10 }, { 0xd007, 0x40 }, { 0xd008, 0x44 }, { 0xd009, 0x00 },
> + { 0xd00a, 0x68 }, { 0xd00b, 0x00 }, { 0xd00c, 0x15 }, { 0xd00d, 0x00 },
> + { 0xd00e, 0x00 }, { 0xd00f, 0x00 }, { 0xd040, 0x9c }, { 0xd041, 0x21 },
> + { 0xd042, 0xff }, { 0xd043, 0xf8 }, { 0xd044, 0xd4 }, { 0xd045, 0x01 },
> + { 0xd046, 0x48 }, { 0xd047, 0x00 }, { 0xd048, 0xd4 }, { 0xd049, 0x01 },
> + { 0xd04a, 0x50 }, { 0xd04b, 0x04 }, { 0xd04c, 0x18 }, { 0xd04d, 0x60 },
> + { 0xd04e, 0x00 }, { 0xd04f, 0x01 }, { 0xd050, 0xa8 }, { 0xd051, 0x63 },
> + { 0xd052, 0x02 }, { 0xd053, 0xa4 }, { 0xd054, 0x85 }, { 0xd055, 0x43 },
> + { 0xd056, 0x00 }, { 0xd057, 0x00 }, { 0xd058, 0x18 }, { 0xd059, 0x60 },
> + { 0xd05a, 0x00 }, { 0xd05b, 0x01 }, { 0xd05c, 0xa8 }, { 0xd05d, 0x63 },
> + { 0xd05e, 0x03 }, { 0xd05f, 0xf0 }, { 0xd060, 0x98 }, { 0xd061, 0xa3 },
> + { 0xd062, 0x00 }, { 0xd063, 0x00 }, { 0xd064, 0x8c }, { 0xd065, 0x6a },
> + { 0xd066, 0x00 }, { 0xd067, 0x6e }, { 0xd068, 0xe5 }, { 0xd069, 0x85 },
> + { 0xd06a, 0x18 }, { 0xd06b, 0x00 }, { 0xd06c, 0x10 }, { 0xd06d, 0x00 },
> + { 0xd06e, 0x00 }, { 0xd06f, 0x10 }, { 0xd070, 0x9c }, { 0xd071, 0x80 },
> + { 0xd072, 0x00 }, { 0xd073, 0x03 }, { 0xd074, 0x18 }, { 0xd075, 0x60 },
> + { 0xd076, 0x00 }, { 0xd077, 0x01 }, { 0xd078, 0xa8 }, { 0xd079, 0x63 },
> + { 0xd07a, 0x07 }, { 0xd07b, 0x80 }, { 0xd07c, 0x07 }, { 0xd07d, 0xff },
> + { 0xd07e, 0xf9 }, { 0xd07f, 0x03 }, { 0xd080, 0x8c }, { 0xd081, 0x63 },
> + { 0xd082, 0x00 }, { 0xd083, 0x00 }, { 0xd084, 0xa5 }, { 0xd085, 0x6b },
> + { 0xd086, 0x00 }, { 0xd087, 0xff }, { 0xd088, 0x18 }, { 0xd089, 0x80 },
> + { 0xd08a, 0x00 }, { 0xd08b, 0x01 }, { 0xd08c, 0xa8 }, { 0xd08d, 0x84 },
> + { 0xd08e, 0x01 }, { 0xd08f, 0x04 }, { 0xd090, 0xe1 }, { 0xd091, 0x6b },
> + { 0xd092, 0x58 }, { 0xd093, 0x00 }, { 0xd094, 0x94 }, { 0xd095, 0x6a },
> + { 0xd096, 0x00 }, { 0xd097, 0x70 }, { 0xd098, 0xe1 }, { 0xd099, 0x6b },
> + { 0xd09a, 0x20 }, { 0xd09b, 0x00 }, { 0xd09c, 0x95 }, { 0xd09d, 0x6b },
> + { 0xd09e, 0x00 }, { 0xd09f, 0x00 }, { 0xd0a0, 0xe4 }, { 0xd0a1, 0x8b },
> + { 0xd0a2, 0x18 }, { 0xd0a3, 0x00 }, { 0xd0a4, 0x0c }, { 0xd0a5, 0x00 },
> + { 0xd0a6, 0x00 }, { 0xd0a7, 0x23 }, { 0xd0a8, 0x15 }, { 0xd0a9, 0x00 },
> + { 0xd0aa, 0x00 }, { 0xd0ab, 0x00 }, { 0xd0ac, 0x18 }, { 0xd0ad, 0x60 },
> + { 0xd0ae, 0x80 }, { 0xd0af, 0x06 }, { 0xd0b0, 0xa8 }, { 0xd0b1, 0x83 },
> + { 0xd0b2, 0x40 }, { 0xd0b3, 0x08 }, { 0xd0b4, 0xa8 }, { 0xd0b5, 0xe3 },
> + { 0xd0b6, 0x38 }, { 0xd0b7, 0x2a }, { 0xd0b8, 0xa8 }, { 0xd0b9, 0xc3 },
> + { 0xd0ba, 0x40 }, { 0xd0bb, 0x09 }, { 0xd0bc, 0xa8 }, { 0xd0bd, 0xa3 },
> + { 0xd0be, 0x38 }, { 0xd0bf, 0x29 }, { 0xd0c0, 0x8c }, { 0xd0c1, 0x65 },
> + { 0xd0c2, 0x00 }, { 0xd0c3, 0x00 }, { 0xd0c4, 0xd8 }, { 0xd0c5, 0x04 },
> + { 0xd0c6, 0x18 }, { 0xd0c7, 0x00 }, { 0xd0c8, 0x8c }, { 0xd0c9, 0x67 },
> + { 0xd0ca, 0x00 }, { 0xd0cb, 0x00 }, { 0xd0cc, 0xd8 }, { 0xd0cd, 0x06 },
> + { 0xd0ce, 0x18 }, { 0xd0cf, 0x00 }, { 0xd0d0, 0x18 }, { 0xd0d1, 0x60 },
> + { 0xd0d2, 0x80 }, { 0xd0d3, 0x06 }, { 0xd0d4, 0xa8 }, { 0xd0d5, 0xe3 },
> + { 0xd0d6, 0x67 }, { 0xd0d7, 0x02 }, { 0xd0d8, 0xa9 }, { 0xd0d9, 0x03 },
> + { 0xd0da, 0x67 }, { 0xd0db, 0x03 }, { 0xd0dc, 0xa8 }, { 0xd0dd, 0xc3 },
> + { 0xd0de, 0x3d }, { 0xd0df, 0x05 }, { 0xd0e0, 0x8c }, { 0xd0e1, 0x66 },
> + { 0xd0e2, 0x00 }, { 0xd0e3, 0x00 }, { 0xd0e4, 0xb8 }, { 0xd0e5, 0x63 },
> + { 0xd0e6, 0x00 }, { 0xd0e7, 0x18 }, { 0xd0e8, 0xb8 }, { 0xd0e9, 0x63 },
> + { 0xd0ea, 0x00 }, { 0xd0eb, 0x98 }, { 0xd0ec, 0xbc }, { 0xd0ed, 0x03 },
> + { 0xd0ee, 0x00 }, { 0xd0ef, 0x00 }, { 0xd0f0, 0x10 }, { 0xd0f1, 0x00 },
> + { 0xd0f2, 0x00 }, { 0xd0f3, 0x16 }, { 0xd0f4, 0xb8 }, { 0xd0f5, 0x83 },
> + { 0xd0f6, 0x00 }, { 0xd0f7, 0x19 }, { 0xd0f8, 0x8c }, { 0xd0f9, 0x67 },
> + { 0xd0fa, 0x00 }, { 0xd0fb, 0x00 }, { 0xd0fc, 0xb8 }, { 0xd0fd, 0xa4 },
> + { 0xd0fe, 0x00 }, { 0xd0ff, 0x98 }, { 0xd100, 0xb8 }, { 0xd101, 0x83 },
> + { 0xd102, 0x00 }, { 0xd103, 0x08 }, { 0xd104, 0x8c }, { 0xd105, 0x68 },
> + { 0xd106, 0x00 }, { 0xd107, 0x00 }, { 0xd108, 0xe0 }, { 0xd109, 0x63 },
> + { 0xd10a, 0x20 }, { 0xd10b, 0x04 }, { 0xd10c, 0xe0 }, { 0xd10d, 0x65 },
> + { 0xd10e, 0x18 }, { 0xd10f, 0x00 }, { 0xd110, 0xa4 }, { 0xd111, 0x83 },
> + { 0xd112, 0xff }, { 0xd113, 0xff }, { 0xd114, 0xb8 }, { 0xd115, 0x64 },
> + { 0xd116, 0x00 }, { 0xd117, 0x48 }, { 0xd118, 0xd8 }, { 0xd119, 0x07 },
> + { 0xd11a, 0x18 }, { 0xd11b, 0x00 }, { 0xd11c, 0xd8 }, { 0xd11d, 0x08 },
> + { 0xd11e, 0x20 }, { 0xd11f, 0x00 }, { 0xd120, 0x9c }, { 0xd121, 0x60 },
> + { 0xd122, 0x00 }, { 0xd123, 0x00 }, { 0xd124, 0xd8 }, { 0xd125, 0x06 },
> + { 0xd126, 0x18 }, { 0xd127, 0x00 }, { 0xd128, 0x00 }, { 0xd129, 0x00 },
> + { 0xd12a, 0x00 }, { 0xd12b, 0x08 }, { 0xd12c, 0x15 }, { 0xd12d, 0x00 },
> + { 0xd12e, 0x00 }, { 0xd12f, 0x00 }, { 0xd130, 0x8c }, { 0xd131, 0x6a },
> + { 0xd132, 0x00 }, { 0xd133, 0x76 }, { 0xd134, 0xbc }, { 0xd135, 0x23 },
> + { 0xd136, 0x00 }, { 0xd137, 0x00 }, { 0xd138, 0x13 }, { 0xd139, 0xff },
> + { 0xd13a, 0xff }, { 0xd13b, 0xe6 }, { 0xd13c, 0x18 }, { 0xd13d, 0x60 },
> + { 0xd13e, 0x80 }, { 0xd13f, 0x06 }, { 0xd140, 0x03 }, { 0xd141, 0xff },
> + { 0xd142, 0xff }, { 0xd143, 0xdd }, { 0xd144, 0xa8 }, { 0xd145, 0x83 },
> + { 0xd146, 0x40 }, { 0xd147, 0x08 }, { 0xd148, 0x85 }, { 0xd149, 0x21 },
> + { 0xd14a, 0x00 }, { 0xd14b, 0x00 }, { 0xd14c, 0x85 }, { 0xd14d, 0x41 },
> + { 0xd14e, 0x00 }, { 0xd14f, 0x04 }, { 0xd150, 0x44 }, { 0xd151, 0x00 },
> + { 0xd152, 0x48 }, { 0xd153, 0x00 }, { 0xd154, 0x9c }, { 0xd155, 0x21 },
> + { 0xd156, 0x00 }, { 0xd157, 0x08 }, { 0x6f0e, 0x03 }, { 0x6f0f, 0x00 },
> + { 0x460e, 0x08 }, { 0x460f, 0x01 }, { 0x4610, 0x00 }, { 0x4611, 0x01 },
> + { 0x4612, 0x00 }, { 0x4613, 0x01 }, { 0x4605, 0x08 }, { 0x4608, 0x00 },
> + { 0x4609, 0x08 }, { 0x6804, 0x00 }, { 0x6805, 0x06 }, { 0x6806, 0x00 },
> + { 0x5120, 0x00 }, { 0x3510, 0x00 }, { 0x3504, 0x00 }, { 0x6800, 0x00 },
> + { 0x6f0d, 0x01 }, { 0x5000, 0xff }, { 0x5001, 0xbf }, { 0x5002, 0x7e },
> + { 0x503d, 0x00 }, { 0xc450, 0x01 }, { 0xc452, 0x04 }, { 0xc453, 0x00 },
> + { 0xc454, 0x00 }, { 0xc455, 0x00 }, { 0xc456, 0x00 }, { 0xc457, 0x00 },
> + { 0xc458, 0x00 }, { 0xc459, 0x00 }, { 0xc45b, 0x00 }, { 0xc45c, 0x00 },
> + { 0xc45d, 0x00 }, { 0xc45e, 0x00 }, { 0xc45f, 0x00 }, { 0xc460, 0x00 },
> + { 0xc461, 0x01 }, { 0xc462, 0x01 }, { 0xc464, 0x88 }, { 0xc465, 0x00 },
> + { 0xc466, 0x8a }, { 0xc467, 0x00 }, { 0xc468, 0x86 }, { 0xc469, 0x00 },
> + { 0xc46a, 0x40 }, { 0xc46b, 0x50 }, { 0xc46c, 0x30 }, { 0xc46d, 0x28 },
> + { 0xc46e, 0x60 }, { 0xc46f, 0x40 }, { 0xc47c, 0x01 }, { 0xc47d, 0x38 },
> + { 0xc47e, 0x00 }, { 0xc47f, 0x00 }, { 0xc480, 0x00 }, { 0xc481, 0xff },
> + { 0xc482, 0x00 }, { 0xc483, 0x40 }, { 0xc484, 0x00 }, { 0xc485, 0x18 },
> + { 0xc486, 0x00 }, { 0xc487, 0x18 }, { 0xc488, 0x2e }, { 0xc489, 0x40 },
> + { 0xc48a, 0x2e }, { 0xc48b, 0x40 }, { 0xc48c, 0x00 }, { 0xc48d, 0x04 },
> + { 0xc48e, 0x00 }, { 0xc48f, 0x04 }, { 0xc490, 0x07 }, { 0xc492, 0x20 },
> + { 0xc493, 0x08 }, { 0xc498, 0x02 }, { 0xc499, 0x00 }, { 0xc49a, 0x02 },
> + { 0xc49b, 0x00 }, { 0xc49c, 0x02 }, { 0xc49d, 0x00 }, { 0xc49e, 0x02 },
> + { 0xc49f, 0x60 }, { 0xc4a0, 0x03 }, { 0xc4a1, 0x00 }, { 0xc4a2, 0x04 },
> + { 0xc4a3, 0x00 }, { 0xc4a4, 0x00 }, { 0xc4a5, 0x10 }, { 0xc4a6, 0x00 },
> + { 0xc4a7, 0x40 }, { 0xc4a8, 0x00 }, { 0xc4a9, 0x80 }, { 0xc4aa, 0x0d },
> + { 0xc4ab, 0x00 }, { 0xc4ac, 0x0f }, { 0xc4ad, 0xc0 }, { 0xc4b4, 0x01 },
> + { 0xc4b5, 0x01 }, { 0xc4b6, 0x00 }, { 0xc4b7, 0x01 }, { 0xc4b8, 0x00 },
> + { 0xc4b9, 0x01 }, { 0xc4ba, 0x01 }, { 0xc4bb, 0x00 }, { 0xc4bc, 0x01 },
> + { 0xc4bd, 0x60 }, { 0xc4be, 0x02 }, { 0xc4bf, 0x33 }, { 0xc4c8, 0x03 },
> + { 0xc4c9, 0xd0 }, { 0xc4ca, 0x0e }, { 0xc4cb, 0x00 }, { 0xc4cc, 0x0e },
> + { 0xc4cd, 0x51 }, { 0xc4ce, 0x0e }, { 0xc4cf, 0x51 }, { 0xc4d0, 0x04 },
> + { 0xc4d1, 0x80 }, { 0xc4e0, 0x04 }, { 0xc4e1, 0x02 }, { 0xc4e2, 0x01 },
> + { 0xc4e4, 0x10 }, { 0xc4e5, 0x20 }, { 0xc4e6, 0x30 }, { 0xc4e7, 0x40 },
> + { 0xc4e8, 0x50 }, { 0xc4e9, 0x60 }, { 0xc4ea, 0x70 }, { 0xc4eb, 0x80 },
> + { 0xc4ec, 0x90 }, { 0xc4ed, 0xa0 }, { 0xc4ee, 0xb0 }, { 0xc4ef, 0xc0 },
> + { 0xc4f0, 0xd0 }, { 0xc4f1, 0xe0 }, { 0xc4f2, 0xf0 }, { 0xc4f3, 0x80 },
> + { 0xc4f4, 0x00 }, { 0xc4f5, 0x20 }, { 0xc4f6, 0x02 }, { 0xc4f7, 0x00 },
> + { 0xc4f8, 0x04 }, { 0xc4f9, 0x0b }, { 0xc4fa, 0x00 }, { 0xc4fb, 0x01 },
> + { 0xc4fc, 0x01 }, { 0xc4fd, 0x00 }, { 0xc4fe, 0x04 }, { 0xc4ff, 0x02 },
> + { 0xc500, 0x48 }, { 0xc501, 0x74 }, { 0xc502, 0x58 }, { 0xc503, 0x80 },
> + { 0xc504, 0x05 }, { 0xc505, 0x80 }, { 0xc506, 0x03 }, { 0xc507, 0x80 },
> + { 0xc508, 0x01 }, { 0xc509, 0xc0 }, { 0xc50a, 0x01 }, { 0xc50b, 0xa0 },
> + { 0xc50c, 0x01 }, { 0xc50d, 0x2c }, { 0xc50e, 0x01 }, { 0xc50f, 0x0a },
> + { 0xc510, 0x00 }, { 0xc511, 0x00 }, { 0xc512, 0xe5 }, { 0xc513, 0x14 },
> + { 0xc514, 0x04 }, { 0xc515, 0x00 }, { 0xc518, 0x03 }, { 0xc519, 0x48 },
> + { 0xc51a, 0x07 }, { 0xc51b, 0x70 }, { 0xc2e0, 0x00 }, { 0xc2e1, 0x51 },
> + { 0xc2e2, 0x00 }, { 0xc2e3, 0xd6 }, { 0xc2e4, 0x01 }, { 0xc2e5, 0x5e },
> + { 0xc2e9, 0x01 }, { 0xc2ea, 0x7a }, { 0xc2eb, 0x90 }, { 0xc2ed, 0x00 },
> + { 0xc2ee, 0x7a }, { 0xc2ef, 0x64 }, { 0xc308, 0x00 }, { 0xc309, 0x00 },
> + { 0xc30a, 0x00 }, { 0xc30c, 0x00 }, { 0xc30d, 0x01 }, { 0xc30e, 0x00 },
> + { 0xc30f, 0x00 }, { 0xc310, 0x01 }, { 0xc311, 0x60 }, { 0xc312, 0xff },
> + { 0xc313, 0x08 }, { 0xc314, 0x01 }, { 0xc315, 0x7f }, { 0xc316, 0xff },
> + { 0xc317, 0x0b }, { 0xc318, 0x00 }, { 0xc319, 0x0c }, { 0xc31a, 0x00 },
> + { 0xc31b, 0xe0 }, { 0xc31c, 0x00 }, { 0xc31d, 0x14 }, { 0xc31e, 0x00 },
> + { 0xc31f, 0xc5 }, { 0xc320, 0xff }, { 0xc321, 0x4b }, { 0xc322, 0xff },
> + { 0xc323, 0xf0 }, { 0xc324, 0xff }, { 0xc325, 0xe8 }, { 0xc326, 0x00 },
> + { 0xc327, 0x46 }, { 0xc328, 0xff }, { 0xc329, 0xd2 }, { 0xc32a, 0xff },
> + { 0xc32b, 0xe4 }, { 0xc32c, 0xff }, { 0xc32d, 0xbb }, { 0xc32e, 0x00 },
> + { 0xc32f, 0x61 }, { 0xc330, 0xff }, { 0xc331, 0xf9 }, { 0xc332, 0x00 },
> + { 0xc333, 0xd9 }, { 0xc334, 0x00 }, { 0xc335, 0x2e }, { 0xc336, 0x00 },
> + { 0xc337, 0xb1 }, { 0xc338, 0xff }, { 0xc339, 0x64 }, { 0xc33a, 0xff },
> + { 0xc33b, 0xeb }, { 0xc33c, 0xff }, { 0xc33d, 0xe8 }, { 0xc33e, 0x00 },
> + { 0xc33f, 0x48 }, { 0xc340, 0xff }, { 0xc341, 0xd0 }, { 0xc342, 0xff },
> + { 0xc343, 0xed }, { 0xc344, 0xff }, { 0xc345, 0xad }, { 0xc346, 0x00 },
> + { 0xc347, 0x66 }, { 0xc348, 0x01 }, { 0xc349, 0x00 }, { 0x6700, 0x04 },
> + { 0x6701, 0x7b }, { 0x6702, 0xfd }, { 0x6703, 0xf9 }, { 0x6704, 0x3d },
> + { 0x6705, 0x71 }, { 0x6706, 0x78 }, { 0x6708, 0x05 }, { 0x6f06, 0x6f },
> + { 0x6f07, 0x00 }, { 0x6f0a, 0x6f }, { 0x6f0b, 0x00 }, { 0x6f00, 0x03 },
> + { 0xc34c, 0x01 }, { 0xc34d, 0x00 }, { 0xc34e, 0x46 }, { 0xc34f, 0x55 },
> + { 0xc350, 0x00 }, { 0xc351, 0x40 }, { 0xc352, 0x00 }, { 0xc353, 0xff },
> + { 0xc354, 0x04 }, { 0xc355, 0x08 }, { 0xc356, 0x01 }, { 0xc357, 0xef },
> + { 0xc358, 0x30 }, { 0xc359, 0x01 }, { 0xc35a, 0x64 }, { 0xc35b, 0x46 },
> + { 0xc35c, 0x00 }, { 0xc4bc, 0x01 }, { 0xc4bd, 0x60 }, { 0x5608, 0x0d },
> +};
> +
> +static const struct ov10635_reg ov10635_regs_change_mode[] = {
> + { 0x301b, 0xff }, { 0x301c, 0xff }, { 0x301a, 0xff }, { 0x5005, 0x08 },
> + { 0x3007, 0x01 }, { 0x381c, 0x00 }, { 0x381f, 0x0C }, { 0x4001, 0x04 },
> + { 0x4004, 0x08 }, { 0x4050, 0x20 }, { 0x4051, 0x22 }, { 0x6e47, 0x0C },
> + { 0x4610, 0x05 }, { 0x4613, 0x10 },
> +};
> +
> +static const struct ov10635_reg ov10635_regs_bt656[] = {
> + { 0x4700, 0x02 }, { 0x4302, 0x03 }, { 0x4303, 0xf8 }, { 0x4304, 0x00 },
> + { 0x4305, 0x08 }, { 0x4306, 0x03 }, { 0x4307, 0xf8 }, { 0x4308, 0x00 },
> + { 0x4309, 0x08 },
> +};
> +
> +static const struct ov10635_reg ov10635_regs_bt656_10bit[] = {
> + { 0x4700, 0x02 }, { 0x4302, 0x03 }, { 0x4303, 0xfe }, { 0x4304, 0x00 },
> + { 0x4305, 0x02 }, { 0x4306, 0x03 }, { 0x4307, 0xfe }, { 0x4308, 0x00 },
> + { 0x4309, 0x02 },
> +};
> +
> +static const struct ov10635_reg ov10635_regs_vert_sub_sample[] = {
> + { 0x381f, 0x06 }, { 0x4001, 0x02 }, { 0x4004, 0x02 }, { 0x4050, 0x10 },
> + { 0x4051, 0x11 }, { 0x6e47, 0x06 }, { 0x4610, 0x03 }, { 0x4613, 0x0a },
> +};
> +
> +static const struct ov10635_reg ov10635_regs_enable[] = {
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 },
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 },
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 },
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 },
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 },
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x3042, 0xf0 },
> + { 0x3042, 0xf0 }, { 0x3042, 0xf0 }, { 0x301b, 0xf0 }, { 0x301c, 0xf0 },
> + { 0x301a, 0xf0 },
> +};
> +
> +/*
> + * supported color format list
> + */
> +static const struct ov10635_color_format ov10635_cfmts[] = {
> + {
> + .code = V4L2_MBUS_FMT_YUYV8_2X8,
> + .colorspace = V4L2_COLORSPACE_SMPTE170M,
> + },
> + {
> + .code = V4L2_MBUS_FMT_YUYV10_2X10,
> + .colorspace = V4L2_COLORSPACE_SMPTE170M,
> + },
> +};
> +
> +static struct ov10635_priv *to_ov10635(const struct i2c_client *client)
> +{
> + return container_of(i2c_get_clientdata(client), struct ov10635_priv,
> + subdev);
> +}
> +
> +/* read a register */
> +static int ov10635_reg_read(struct i2c_client *client, u16 reg, u8 *val)
> +{
> + int ret;
> + u8 data[2] = { reg >> 8, reg & 0xff };
> + struct i2c_msg msg = {
> + .addr = client->addr,
> + .flags = 0,
> + .len = 2,
> + .buf = data,
> + };
> +
> + ret = i2c_transfer(client->adapter, &msg, 1);
> + if (ret < 0)
> + goto err;
> +
> + msg.flags = I2C_M_RD;
> + msg.len = 1;
> + msg.buf = data,
> + ret = i2c_transfer(client->adapter, &msg, 1);
> + if (ret < 0)
> + goto err;
> +
> + *val = data[0];
> + return 0;
> +
> +err:
> + dev_err(&client->dev, "Failed reading register 0x%04x!\n", reg);
> + return ret;
> +}
> +
> +/* write a register */
> +static int ov10635_reg_write(struct i2c_client *client, u16 reg, u8 val)
> +{
> + int ret;
> + u8 data[3] = { reg >> 8, reg & 0xff, val };
> +
> + struct i2c_msg msg = {
> + .addr = client->addr,
> + .flags = 0,
> + .len = 3,
> + .buf = data,
> + };
> +
> + ret = i2c_transfer(client->adapter, &msg, 1);
> + if (ret < 0) {
> + dev_err(&client->dev, "Failed writing register 0x%04x!\n", reg);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int ov10635_reg_write16(struct i2c_client *client, u16 reg, u16 val)
> +{
> + int ret;
> +
> + ret = ov10635_reg_write(client, reg, val >> 8);
> + if (ret)
> + return ret;
> +
> + ret = ov10635_reg_write(client, reg + 1, val & 0xff);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +/* Read a register, alter its bits, write it back */
> +static int ov10635_reg_rmw(struct i2c_client *client, u16 reg, u8 set, u8 unset)
> +{
> + u8 val;
> + int ret;
> +
> + ret = ov10635_reg_read(client, reg, &val);
> + if (ret) {
> + dev_err(&client->dev,
> + "[Read]-Modify-Write of register %04x failed!\n", reg);
> + return ret;
> + }
> +
> + val |= set;
> + val &= ~unset;
> +
> + ret = ov10635_reg_write(client, reg, val);
> + if (ret)
> + dev_err(&client->dev,
> + "Read-Modify-[Write] of register %04x failed!\n", reg);
> +
> + return ret;
> +}
> +
> +
> +/* Start/Stop streaming from the device */
> +static int ov10635_s_stream(struct v4l2_subdev *sd, int enable)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> +
> + ov10635_reg_write(client, 0x0100, enable);
> + return 0;
> +}
> +
> +/* Set status of additional camera capabilities */
> +static int ov10635_s_ctrl(struct v4l2_ctrl *ctrl)
> +{
> + struct ov10635_priv *priv = container_of(ctrl->handler,
> + struct ov10635_priv, hdl);
> + struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev);
> +
> + switch (ctrl->id) {
> + case V4L2_CID_VFLIP:
> + if (ctrl->val)
> + return ov10635_reg_rmw(client, OV10635_VFLIP,
> + OV10635_VFLIP_ON, 0);
> + else
No need for 'else'.
> + return ov10635_reg_rmw(client, OV10635_VFLIP,
> + 0, OV10635_VFLIP_ON);
> + break;
No need for 'break'. Ditto for HFLIP.
> + case V4L2_CID_HFLIP:
> + if (ctrl->val)
> + return ov10635_reg_rmw(client, OV10635_HMIRROR,
> + OV10635_HMIRROR_ON, 0);
> + else
> + return ov10635_reg_rmw(client, OV10635_HMIRROR,
> + 0, OV10635_HMIRROR_ON);
> + break;
> + }
> +
> + return -EINVAL;
> +}
> +
> +/* Get chip identification */
> +static int ov10635_g_chip_ident(struct v4l2_subdev *sd,
> + struct v4l2_dbg_chip_ident *id)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> +
> + id->ident = priv->model;
> + id->revision = priv->revision;
> +
> + return 0;
> +}
Drop this function, no longer needed.
> +
> +/*
> + * Get the best pixel clock (pclk) that meets minimum hts/vts requirements.
> + * xvclk => pre-divider => clk1 => multiplier => clk2 => post-divider => pclk
> + * We try all valid combinations of settings for the 3 blocks to get the pixel
> + * clock, and from that calculate the actual hts/vts to use. The vts is
> + * extended so as to achieve the required frame rate. The function also returns
> + * the PLL register contents needed to set the pixel clock.
> + */
> +static int ov10635_get_pclk(int xvclk, int *htsmin, int *vtsmin,
> + int fps_numerator, int fps_denominator,
> + u8 *r3003, u8 *r3004)
> +{
> + int pre_divs[] = { 2, 3, 4, 6, 8, 10, 12, 14 };
> + int pclk;
> + int best_pclk = INT_MAX;
> + int best_hts = 0;
> + int i, j, k;
> + int best_i = 0, best_j = 0, best_k = 0;
> + int clk1, clk2;
> + int hts;
> +
> + /* Pre-div, reg 0x3004, bits 6:4 */
> + for (i = 0; i < ARRAY_SIZE(pre_divs); i++) {
> + clk1 = (xvclk / pre_divs[i]) * 2;
> +
> + if ((clk1 < 3000000) || (clk1 > 27000000))
> + continue;
> +
> + /* Mult = reg 0x3003, bits 5:0 */
> + for (j = 1; j < 32; j++) {
> + clk2 = (clk1 * j);
> +
> + if ((clk2 < 200000000) || (clk2 > 500000000))
> + continue;
> +
> + /* Post-div, reg 0x3004, bits 2:0 */
> + for (k = 0; k < 8; k++) {
> + pclk = clk2 / (2*(k+1));
> +
> + if (pclk > 96000000)
> + continue;
> +
> + hts = *htsmin + 200 + pclk/300000;
> +
> + /* 2 clock cycles for every YUV422 pixel */
> + if (pclk < (((hts * *vtsmin)/fps_denominator)
> + * fps_numerator * 2))
> + continue;
> +
> + if (pclk < best_pclk) {
> + best_pclk = pclk;
> + best_hts = hts;
> + best_i = i;
> + best_j = j;
> + best_k = k;
> + }
> + }
> + }
> + }
> +
> + /* register contents */
> + *r3003 = (u8)best_j;
> + *r3004 = ((u8)best_i << 4) | (u8)best_k;
> +
> + /* Did we get a valid PCLK? */
> + if (best_pclk == INT_MAX)
> + return -1;
> +
> + *htsmin = best_hts;
> +
> + /* Adjust vts to get as close to the desired frame rate as we can */
> + *vtsmin = best_pclk / ((best_hts/fps_denominator) * fps_numerator * 2);
> +
> + return best_pclk;
> +}
> +
> +static int ov10635_set_regs(struct i2c_client *client,
> + const struct ov10635_reg *regs, int nr_regs)
> +{
> + int i, ret;
> +
> + for (i = 0; i < nr_regs; i++) {
> + ret = ov10635_reg_write(client, regs[i].reg, regs[i].val);
> + if (ret)
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +/* Setup registers according to resolution and color encoding */
> +static int ov10635_set_params(struct i2c_client *client, u32 *width,
> + u32 *height,
> + enum v4l2_mbus_pixelcode code)
> +{
> + struct ov10635_priv *priv = to_ov10635(client);
> + int ret = -EINVAL;
> + int pclk;
> + int hts, vts;
> + u8 r3003, r3004;
> + int tmp;
> + u32 height_pre_subsample;
> + u32 width_pre_subsample;
> + u8 horiz_crop_mode;
> + int i;
> + int nr_isp_pixels;
> + int vert_sub_sample = 0;
> + int horiz_sub_sample = 0;
> + int sensor_width;
> +
> + if ((*width > OV10635_MAX_WIDTH) || (*height > OV10635_MAX_HEIGHT))
> + return ret;
> +
> + /* select format */
> + priv->cfmt = NULL;
> + for (i = 0; i < ARRAY_SIZE(ov10635_cfmts); i++) {
> + if (code == ov10635_cfmts[i].code) {
> + priv->cfmt = ov10635_cfmts + i;
> + break;
> + }
> + }
> + if (!priv->cfmt)
> + goto ov10635_set_fmt_error;
> +
> + priv->width = *width;
> + priv->height = *height;
> +
> + /* Vertical sub-sampling? */
> + height_pre_subsample = priv->height;
> + if (priv->height <= 400) {
> + vert_sub_sample = 1;
> + height_pre_subsample <<= 1;
> + }
> +
> + /* Horizontal sub-sampling? */
> + width_pre_subsample = priv->width;
> + if (priv->width <= 640) {
> + horiz_sub_sample = 1;
> + width_pre_subsample <<= 1;
> + }
> +
> + /* Horizontal cropping */
> + if (width_pre_subsample > 768) {
> + sensor_width = OV10635_SENSOR_WIDTH;
> + horiz_crop_mode = 0x63;
> + } else if (width_pre_subsample > 656) {
> + sensor_width = 768;
> + horiz_crop_mode = 0x6b;
> + } else {
> + sensor_width = 656;
> + horiz_crop_mode = 0x73;
> + }
> +
> + /* minimum values for hts and vts */
> + hts = sensor_width;
> + vts = height_pre_subsample + 50;
> + dev_dbg(&client->dev, "fps=(%d/%d), hts=%d, vts=%d\n",
> + priv->fps_numerator, priv->fps_denominator, hts, vts);
> +
> + /* Get the best PCLK & adjust hts,vts accordingly */
> + pclk = ov10635_get_pclk(priv->xvclk, &hts, &vts, priv->fps_numerator,
> + priv->fps_denominator, &r3003, &r3004);
> + if (pclk < 0)
> + return ret;
> + dev_dbg(&client->dev, "pclk=%d, hts=%d, vts=%d\n", pclk, hts, vts);
> + dev_dbg(&client->dev, "r3003=0x%X r3004=0x%X\n", r3003, r3004);
> +
> + /* Disable ISP & program all registers that we might modify */
> + ret = ov10635_set_regs(client, ov10635_regs_change_mode,
> + ARRAY_SIZE(ov10635_regs_change_mode));
> + if (ret)
> + return ret;
> +
> + /* Set PLL */
> + ret = ov10635_reg_write(client, 0x3003, r3003);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write(client, 0x3004, r3004);
> + if (ret)
> + return ret;
> +
> + /* Set format to UYVY */
> + ret = ov10635_reg_write(client, 0x4300, 0x3a);
> + if (ret)
> + return ret;
> +
> + if (priv->cfmt->code == V4L2_MBUS_FMT_YUYV8_2X8) {
> + /* Set mode to 8-bit BT.656 */
> + ret = ov10635_set_regs(client, ov10635_regs_bt656,
> + ARRAY_SIZE(ov10635_regs_bt656));
> + if (ret)
> + return ret;
> +
> + /* Set output to 8-bit yuv */
> + ret = ov10635_reg_write(client, 0x4605, 0x08);
> + if (ret)
> + return ret;
> + } else {
> + /* V4L2_MBUS_FMT_YUYV10_2X10 */
> + /* Set mode to 10-bit BT.656 */
> + ret = ov10635_set_regs(client, ov10635_regs_bt656_10bit,
> + ARRAY_SIZE(ov10635_regs_bt656_10bit));
> + if (ret)
> + return ret;
> +
> + /* Set output to 10-bit yuv */
> + ret = ov10635_reg_write(client, 0x4605, 0x00);
> + if (ret)
> + return ret;
> + }
> +
> + /* Horizontal cropping */
> + ret = ov10635_reg_write(client, 0x3621, horiz_crop_mode);
> + if (ret)
> + return ret;
> +
> + ret = ov10635_reg_write(client, 0x3702, (pclk+1500000)/3000000);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write(client, 0x3703, (pclk+666666)/1333333);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write(client, 0x3704, (pclk+961500)/1923000);
> + if (ret)
> + return ret;
> +
> + /* Vertical cropping */
> + tmp = ((OV10635_SENSOR_HEIGHT - height_pre_subsample) / 2) & ~0x1;
> + ret = ov10635_reg_write16(client, 0x3802, tmp);
> + if (ret)
> + return ret;
> + tmp = tmp + height_pre_subsample + 3;
> + ret = ov10635_reg_write16(client, 0x3806, tmp);
> + if (ret)
> + return ret;
> +
> + /* Output size */
> + ret = ov10635_reg_write16(client, 0x3808, priv->width);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write16(client, 0x380a, priv->height);
> + if (ret)
> + return ret;
> +
> + ret = ov10635_reg_write16(client, 0x380c, hts);
> + if (ret)
> + return ret;
> +
> + ret = ov10635_reg_write16(client, 0x380e, vts);
> + if (ret)
> + return ret;
> +
> + if (vert_sub_sample) {
> + ret = ov10635_reg_rmw(client, OV10635_VFLIP,
> + OV10635_VFLIP_SUBSAMPLE, 0);
> + if (ret)
> + return ret;
> +
> + ret = ov10635_set_regs(client, ov10635_regs_vert_sub_sample,
> + ARRAY_SIZE(ov10635_regs_vert_sub_sample));
> + if (ret)
> + return ret;
> + }
> +
> + ret = ov10635_reg_write16(client, 0x4606, 2*hts);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write16(client, 0x460a, 2*(hts-width_pre_subsample));
> + if (ret)
> + return ret;
> +
> + tmp = (vts - 8) * 16;
> + ret = ov10635_reg_write16(client, 0xc488, tmp);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write16(client, 0xc48a, tmp);
> + if (ret)
> + return ret;
> +
> + nr_isp_pixels = sensor_width * (priv->height + 4);
> + ret = ov10635_reg_write16(client, 0xc4cc, nr_isp_pixels/256);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write16(client, 0xc4ce, nr_isp_pixels/256);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write16(client, 0xc512, nr_isp_pixels/16);
> + if (ret)
> + return ret;
> +
> + /* Horizontal sub-sampling */
> + if (horiz_sub_sample) {
> + ret = ov10635_reg_write(client, 0x5005, 0x9);
> + if (ret)
> + return ret;
> +
> + ret = ov10635_reg_write(client, 0x3007, 0x2);
> + if (ret)
> + return ret;
> + }
> +
> + ret = ov10635_reg_write16(client, 0xc518, vts);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_write16(client, 0xc51a, hts);
> + if (ret)
> + return ret;
> +
> + /* Enable ISP blocks */
> + ret = ov10635_set_regs(client, ov10635_regs_enable,
> + ARRAY_SIZE(ov10635_regs_enable));
> + if (ret)
> + return ret;
> +
> + /* Wait for settings to take effect */
> + mdelay(300);
> +
> + if (priv->cfmt->code == V4L2_MBUS_FMT_YUYV8_2X8)
> + dev_dbg(&client->dev, "Using 8-bit BT.656\n");
> + else
> + dev_dbg(&client->dev, "Using 10-bit BT.656\n");
> +
> + return 0;
> +
> +ov10635_set_fmt_error:
> + dev_err(&client->dev, "Unsupported settings (%dx%d@(%d/%d)fps)\n",
> + *width, *height, priv->fps_numerator, priv->fps_denominator);
> + priv = NULL;
> + priv->cfmt = NULL;
> +
> + return ret;
> +}
> +
> +static int ov10635_g_fmt(struct v4l2_subdev *sd,
> + struct v4l2_mbus_framefmt *mf)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> + u32 width = OV10635_MAX_WIDTH, height = OV10635_MAX_HEIGHT;
> + enum v4l2_mbus_pixelcode code;
> + int ret;
> +
> + if (priv->cfmt)
> + code = priv->cfmt->code;
> + else
> + code = V4L2_MBUS_FMT_YUYV8_2X8;
> +
> + ret = ov10635_set_params(client, &width, &height, code);
> + if (ret < 0)
> + return ret;
> +
> + mf->width = priv->width;
> + mf->height = priv->height;
> + mf->code = priv->cfmt->code;
> + mf->colorspace = priv->cfmt->colorspace;
> + mf->field = V4L2_FIELD_NONE;
> +
> + return 0;
> +}
> +
> +/* set the format we will capture in */
> +static int ov10635_s_fmt(struct v4l2_subdev *sd,
> + struct v4l2_mbus_framefmt *mf)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> + int ret;
> +
> + ret = ov10635_set_params(client, &mf->width, &mf->height,
> + mf->code);
> + if (!ret)
> + mf->colorspace = priv->cfmt->colorspace;
> +
> + return ret;
> +}
> +
> +static int ov10635_try_fmt(struct v4l2_subdev *sd,
> + struct v4l2_mbus_framefmt *mf)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> + int i;
> +
> + /* Note: All sizes are good */
> +
> + mf->field = V4L2_FIELD_NONE;
> +
> + for (i = 0; i < ARRAY_SIZE(ov10635_cfmts); i++)
> + if (mf->code == ov10635_cfmts[i].code) {
> + mf->colorspace = ov10635_cfmts[i].colorspace;
> + break;
> + }
> +
> + if (i == ARRAY_SIZE(ov10635_cfmts)) {
> + /* Unsupported format requested. Propose either */
> + if (priv->cfmt) {
> + /* the current one or */
> + mf->colorspace = priv->cfmt->colorspace;
> + mf->code = priv->cfmt->code;
> + } else {
> + /* the default one */
> + mf->colorspace = ov10635_cfmts[0].colorspace;
> + mf->code = ov10635_cfmts[0].code;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int ov10635_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
> + enum v4l2_mbus_pixelcode *code)
> +{
> + if (index >= ARRAY_SIZE(ov10635_cfmts))
> + return -EINVAL;
> +
> + *code = ov10635_cfmts[index].code;
> +
> + return 0;
> +}
> +
> +static int ov10635_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> + struct v4l2_captureparm *cp = &parms->parm.capture;
> +
> + if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
> + return -EINVAL;
> +
> + memset(cp, 0, sizeof(struct v4l2_captureparm));
> + cp->capability = V4L2_CAP_TIMEPERFRAME;
> + cp->timeperframe.denominator = priv->fps_numerator;
> + cp->timeperframe.numerator = priv->fps_denominator;
> +
> + return 0;
> +}
> +
> +static int ov10635_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> + struct v4l2_captureparm *cp = &parms->parm.capture;
> + enum v4l2_mbus_pixelcode code;
> + int ret;
> +
> + if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
> + return -EINVAL;
> + if (cp->extendedmode != 0)
> + return -EINVAL;
> +
> + /* FIXME Check we can handle the requested framerate */
> + priv->fps_denominator = cp->timeperframe.numerator;
> + priv->fps_numerator = cp->timeperframe.denominator;
> +
> + if (priv->cfmt)
> + code = priv->cfmt->code;
> + else
> + code = V4L2_MBUS_FMT_YUYV8_2X8;
> +
> + ret = ov10635_set_params(client, &priv->width, &priv->height, code);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int ov10635_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)
> +{
> + struct v4l2_crop a_writable = *a;
> + struct v4l2_rect *rect = &a_writable.c;
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> + int ret = -EINVAL;
> + enum v4l2_mbus_pixelcode code;
> +
> + if (priv->cfmt)
> + code = priv->cfmt->code;
> + else
> + code = V4L2_MBUS_FMT_YUYV8_2X8;
> +
> + ret = ov10635_set_params(client, &rect->width, &rect->height, code);
> + if (!ret)
> + return -EINVAL;
> +
> + rect->width = priv->width;
> + rect->height = priv->height;
> + rect->left = 0;
> + rect->top = 0;
> +
> + return ret;
> +}
> +
> +static int ov10635_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct ov10635_priv *priv = to_ov10635(client);
> +
> + if (priv) {
> + a->c.width = priv->width;
> + a->c.height = priv->height;
> + } else {
> + a->c.width = OV10635_MAX_WIDTH;
> + a->c.height = OV10635_MAX_HEIGHT;
> + }
> +
> + a->c.left = 0;
> + a->c.top = 0;
> + a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> +
> + return 0;
> +}
> +
> +static int ov10635_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
> +{
> + a->bounds.left = 0;
> + a->bounds.top = 0;
> + a->bounds.width = OV10635_MAX_WIDTH;
> + a->bounds.height = OV10635_MAX_HEIGHT;
> + a->defrect = a->bounds;
> + a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> + a->pixelaspect.numerator = 1;
> + a->pixelaspect.denominator = 1;
> +
> + return 0;
> +}
> +
> +static int ov10635_video_probe(struct i2c_client *client)
> +{
> + struct ov10635_priv *priv = to_ov10635(client);
> + u8 pid, ver;
> + int ret;
> +
> + /* Program all the 'standard' registers */
> + ret = ov10635_set_regs(client, ov10635_regs_default,
> + ARRAY_SIZE(ov10635_regs_default));
> + if (ret)
> + return ret;
> +
> + /* check and show product ID and manufacturer ID */
> + ret = ov10635_reg_read(client, OV10635_PID, &pid);
> + if (ret)
> + return ret;
> + ret = ov10635_reg_read(client, OV10635_VER, &ver);
> + if (ret)
> + return ret;
> +
> + if (OV10635_VERSION(pid, ver) != OV10635_VERSION_REG) {
> + dev_err(&client->dev, "Product ID error %x:%x\n", pid, ver);
> + return -ENODEV;
> + }
> +
> + priv->model = V4L2_IDENT_OV10635;
> + priv->revision = 1;
> +
> + dev_info(&client->dev, "ov10635 Product ID %x Manufacturer ID %x\n",
> + pid, ver);
> +
> + return v4l2_ctrl_handler_setup(&priv->hdl);
> +}
> +
> +/* Request bus settings on camera side */
> +static int ov10635_g_mbus_config(struct v4l2_subdev *sd,
> + struct v4l2_mbus_config *cfg)
> +{
> + struct i2c_client *client = v4l2_get_subdevdata(sd);
> + struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
> +
> + cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
> + V4L2_MBUS_DATA_ACTIVE_HIGH;
> + cfg->type = V4L2_MBUS_BT656;
> + cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);
> +
> + return 0;
> +}
> +
> +static const struct v4l2_ctrl_ops ov10635_ctrl_ops = {
> + .s_ctrl = ov10635_s_ctrl,
> +};
> +
> +static struct v4l2_subdev_core_ops ov10635_core_ops = {
> + .g_chip_ident = ov10635_g_chip_ident,
> +};
> +
> +static struct v4l2_subdev_video_ops ov10635_video_ops = {
> + .s_stream = ov10635_s_stream,
> + .g_mbus_fmt = ov10635_g_fmt,
> + .s_mbus_fmt = ov10635_s_fmt,
> + .try_mbus_fmt = ov10635_try_fmt,
> + .enum_mbus_fmt = ov10635_enum_fmt,
> + .cropcap = ov10635_cropcap,
> + .g_crop = ov10635_g_crop,
> + .s_crop = ov10635_s_crop,
> + .g_parm = ov10635_g_parm,
> + .s_parm = ov10635_s_parm,
> + .g_mbus_config = ov10635_g_mbus_config,
> +};
> +
> +static struct v4l2_subdev_ops ov10635_subdev_ops = {
> + .core = &ov10635_core_ops,
> + .video = &ov10635_video_ops,
> +};
> +
> +/*
> + * i2c_driver function
> + */
> +static int ov10635_probe(struct i2c_client *client,
> + const struct i2c_device_id *did)
> +{
> + struct ov10635_priv *priv;
> + struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
> + int ret;
> +
> + if (!ssdd) {
> + dev_err(&client->dev, "Missing platform_data for driver\n");
> + return -EINVAL;
> + }
> +
> + priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + /* TODO External XVCLK is board specific */
> + priv->xvclk = 25000000;
> +
> + /* Default framerate */
> + priv->fps_numerator = 25;
> + priv->fps_denominator = 1;
> +
> + v4l2_i2c_subdev_init(&priv->subdev, client, &ov10635_subdev_ops);
> +
> + v4l2_ctrl_handler_init(&priv->hdl, 2);
> + v4l2_ctrl_new_std(&priv->hdl, &ov10635_ctrl_ops,
> + V4L2_CID_VFLIP, 0, 1, 1, 0);
> + v4l2_ctrl_new_std(&priv->hdl, &ov10635_ctrl_ops,
> + V4L2_CID_HFLIP, 0, 1, 1, 0);
> + priv->subdev.ctrl_handler = &priv->hdl;
> + if (priv->hdl.error)
> + return priv->hdl.error;
> +
> + ret = ov10635_video_probe(client);
> + if (ret)
> + v4l2_ctrl_handler_free(&priv->hdl);
> +
> + return ret;
> +}
> +
> +static int ov10635_remove(struct i2c_client *client)
> +{
> + struct ov10635_priv *priv = i2c_get_clientdata(client);
> +
> + v4l2_device_unregister_subdev(&priv->subdev);
> + v4l2_ctrl_handler_free(&priv->hdl);
> +
> + return 0;
> +}
> +
> +static const struct i2c_device_id ov10635_id[] = {
> + { "ov10635", 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(i2c, ov10635_id);
> +
> +static struct i2c_driver ov10635_i2c_driver = {
> + .driver = {
> + .owner = THIS_MODULE,
> + .name = "ov10635",
> + },
> + .probe = ov10635_probe,
> + .remove = ov10635_remove,
> + .id_table = ov10635_id,
> +};
> +
> +module_i2c_driver(ov10635_i2c_driver);
> +
> +MODULE_DESCRIPTION("SoC Camera driver for OmniVision OV10635");
> +MODULE_AUTHOR("Phil Edworthy <phil.edworthy@xxxxxxxxxxx>");
> +MODULE_LICENSE("GPL v2");
> diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
> index 4ee125b..8fc3303 100644
> --- a/include/media/v4l2-chip-ident.h
> +++ b/include/media/v4l2-chip-ident.h
> @@ -77,6 +77,7 @@ enum {
> V4L2_IDENT_OV2640 = 259,
> V4L2_IDENT_OV9740 = 260,
> V4L2_IDENT_OV5642 = 261,
> + V4L2_IDENT_OV10635 = 262,
>
> /* module saa7146: reserved range 300-309 */
> V4L2_IDENT_SAA7146 = 300,
>
This can be dropped as well, because this header will go away.
Regards,
Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
