Commit 9289998e authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: ov2680: Convert to new CCI register access helpers 



Use the new comon CCI register access helpers to replace the private
register access helpers in the ov2680 driver.

Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 84b4bd7e

drivers/media/i2c/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ config VIDEO_OV2659 


config VIDEO_OV2680

	tristate "OmniVision OV2680 sensor support"

	select V4L2_CCI_I2C

	help

	  This is a Video4Linux2 sensor driver for the OmniVision

	  OV2680 camera.

drivers/media/i2c/ov2680.c

+57 −167
Original line number Diff line number Diff line
@@ -10,17 +10,18 @@ 
 *

 */



#include <asm/unaligned.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/gpio/consumer.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/gpio/consumer.h>

#include <linux/regmap.h>

#include <linux/regulator/consumer.h>



#include <media/v4l2-cci.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-subdev.h>
@@ -29,28 +30,23 @@ 


#define OV2680_CHIP_ID				0x2680



#define OV2680_REG_STREAM_CTRL		0x0100

#define OV2680_REG_SOFT_RESET		0x0103

#define OV2680_REG_STREAM_CTRL			CCI_REG8(0x0100)

#define OV2680_REG_SOFT_RESET			CCI_REG8(0x0103)



#define OV2680_REG_CHIP_ID_HIGH		0x300a

#define OV2680_REG_CHIP_ID_LOW		0x300b

#define OV2680_REG_CHIP_ID			CCI_REG16(0x300a)



#define OV2680_REG_R_MANUAL		0x3503

#define OV2680_REG_GAIN_PK		0x350a

#define OV2680_REG_EXPOSURE_PK_HIGH	0x3500

#define OV2680_REG_TIMING_HTS		0x380c

#define OV2680_REG_TIMING_VTS		0x380e

#define OV2680_REG_FORMAT1		0x3820

#define OV2680_REG_FORMAT2		0x3821

#define OV2680_REG_EXPOSURE_PK			CCI_REG24(0x3500)

#define OV2680_REG_R_MANUAL			CCI_REG8(0x3503)

#define OV2680_REG_GAIN_PK			CCI_REG16(0x350a)

#define OV2680_REG_TIMING_HTS			CCI_REG16(0x380c)

#define OV2680_REG_TIMING_VTS			CCI_REG16(0x380e)

#define OV2680_REG_FORMAT1			CCI_REG8(0x3820)

#define OV2680_REG_FORMAT2			CCI_REG8(0x3821)



#define OV2680_REG_ISP_CTRL00		0x5080

#define OV2680_REG_ISP_CTRL00			CCI_REG8(0x5080)



#define OV2680_FRAME_RATE			30



#define OV2680_REG_VALUE_8BIT		1

#define OV2680_REG_VALUE_16BIT		2

#define OV2680_REG_VALUE_24BIT		3



#define OV2680_WIDTH_MAX			1600

#define OV2680_HEIGHT_MAX			1200
@@ -64,11 +60,6 @@ enum ov2680_mode_id { 
	OV2680_MODE_MAX,

};



struct reg_value {

	u16 reg_addr;

	u8 val;

};



static const char * const ov2680_supply_name[] = {

	"DOVDD",

	"DVDD",
@@ -82,7 +73,7 @@ struct ov2680_mode_info { 
	enum ov2680_mode_id id;

	u32 width;

	u32 height;

	const struct reg_value *reg_data;

	const struct reg_sequence *reg_data;

	u32 reg_data_size;

};
@@ -97,6 +88,7 @@ struct ov2680_ctrls { 


struct ov2680_dev {

	struct i2c_client		*i2c_client;

	struct regmap			*regmap;

	struct v4l2_subdev		sd;



	struct media_pad		pad;
@@ -133,7 +125,7 @@ static const int ov2680_hv_flip_bayer_order[] = { 
	MEDIA_BUS_FMT_SRGGB10_1X10,

};



static const struct reg_value ov2680_setting_30fps_QUXGA_800_600[] = {

static const struct reg_sequence ov2680_setting_30fps_QUXGA_800_600[] = {

	{0x3086, 0x01}, {0x370a, 0x23}, {0x3808, 0x03}, {0x3809, 0x20},

	{0x380a, 0x02}, {0x380b, 0x58}, {0x380c, 0x06}, {0x380d, 0xac},

	{0x380e, 0x02}, {0x380f, 0x84}, {0x3811, 0x04}, {0x3813, 0x04},
@@ -142,14 +134,14 @@ static const struct reg_value ov2680_setting_30fps_QUXGA_800_600[] = { 
	{0x3503, 0x03},

};



static const struct reg_value ov2680_setting_30fps_720P_1280_720[] = {

static const struct reg_sequence ov2680_setting_30fps_720P_1280_720[] = {

	{0x3086, 0x00}, {0x3808, 0x05}, {0x3809, 0x00}, {0x380a, 0x02},

	{0x380b, 0xd0}, {0x380c, 0x06}, {0x380d, 0xa8}, {0x380e, 0x05},

	{0x380f, 0x0e}, {0x3811, 0x08}, {0x3813, 0x06}, {0x3814, 0x11},

	{0x3815, 0x11}, {0x3820, 0xc0}, {0x4008, 0x00},

};



static const struct reg_value ov2680_setting_30fps_UXGA_1600_1200[] = {

static const struct reg_sequence ov2680_setting_30fps_UXGA_1600_1200[] = {

	{0x3086, 0x00}, {0x3501, 0x4e}, {0x3502, 0xe0}, {0x3808, 0x06},

	{0x3809, 0x40}, {0x380a, 0x04}, {0x380b, 0xb0}, {0x380c, 0x06},

	{0x380d, 0xa8}, {0x380e, 0x05}, {0x380f, 0x0e}, {0x3811, 0x00},
@@ -191,115 +183,6 @@ static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl) 
			     ctrls.handler)->sd;

}



static int __ov2680_write_reg(struct ov2680_dev *sensor, u16 reg,

			      unsigned int len, u32 val)

{

	struct i2c_client *client = sensor->i2c_client;

	u8 buf[6];

	int ret;



	if (len > 4)

		return -EINVAL;



	put_unaligned_be16(reg, buf);

	put_unaligned_be32(val << (8 * (4 - len)), buf + 2);

	ret = i2c_master_send(client, buf, len + 2);

	if (ret != len + 2) {

		dev_err(&client->dev, "write error: reg=0x%4x: %d\n", reg, ret);

		return -EIO;

	}



	return 0;

}



#define ov2680_write_reg(s, r, v) \

	__ov2680_write_reg(s, r, OV2680_REG_VALUE_8BIT, v)



#define ov2680_write_reg16(s, r, v) \

	__ov2680_write_reg(s, r, OV2680_REG_VALUE_16BIT, v)



#define ov2680_write_reg24(s, r, v) \

	__ov2680_write_reg(s, r, OV2680_REG_VALUE_24BIT, v)



static int __ov2680_read_reg(struct ov2680_dev *sensor, u16 reg,

			     unsigned int len, u32 *val)

{

	struct i2c_client *client = sensor->i2c_client;

	struct i2c_msg msgs[2];

	u8 addr_buf[2] = { reg >> 8, reg & 0xff };

	u8 data_buf[4] = { 0, };

	int ret;



	if (len > 4)

		return -EINVAL;



	msgs[0].addr = client->addr;

	msgs[0].flags = 0;

	msgs[0].len = ARRAY_SIZE(addr_buf);

	msgs[0].buf = addr_buf;



	msgs[1].addr = client->addr;

	msgs[1].flags = I2C_M_RD;

	msgs[1].len = len;

	msgs[1].buf = &data_buf[4 - len];



	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));

	if (ret != ARRAY_SIZE(msgs)) {

		dev_err(&client->dev, "read error: reg=0x%4x: %d\n", reg, ret);

		return -EIO;

	}



	*val = get_unaligned_be32(data_buf);



	return 0;

}



#define ov2680_read_reg(s, r, v) \

	__ov2680_read_reg(s, r, OV2680_REG_VALUE_8BIT, v)



#define ov2680_read_reg16(s, r, v) \

	__ov2680_read_reg(s, r, OV2680_REG_VALUE_16BIT, v)



#define ov2680_read_reg24(s, r, v) \

	__ov2680_read_reg(s, r, OV2680_REG_VALUE_24BIT, v)



static int ov2680_mod_reg(struct ov2680_dev *sensor, u16 reg, u8 mask, u8 val)

{

	u32 readval;

	int ret;



	ret = ov2680_read_reg(sensor, reg, &readval);

	if (ret < 0)

		return ret;



	readval &= ~mask;

	val &= mask;

	val |= readval;



	return ov2680_write_reg(sensor, reg, val);

}



static int ov2680_load_regs(struct ov2680_dev *sensor,

			    const struct ov2680_mode_info *mode)

{

	const struct reg_value *regs = mode->reg_data;

	unsigned int i;

	int ret = 0;

	u16 reg_addr;

	u8 val;



	for (i = 0; i < mode->reg_data_size; ++i, ++regs) {

		reg_addr = regs->reg_addr;

		val = regs->val;



		ret = ov2680_write_reg(sensor, reg_addr, val);

		if (ret)

			break;

	}



	return ret;

}



static void ov2680_power_up(struct ov2680_dev *sensor)

{

	if (!sensor->reset_gpio)
@@ -351,8 +234,8 @@ static int ov2680_set_vflip(struct ov2680_dev *sensor, s32 val) 
	if (sensor->is_streaming)

		return -EBUSY;



	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1,

			     BIT(2), val ? BIT(2) : 0);

	ret = cci_update_bits(sensor->regmap, OV2680_REG_FORMAT1,

			      BIT(2), val ? BIT(2) : 0, NULL);

	if (ret < 0)

		return ret;
@@ -367,8 +250,8 @@ static int ov2680_set_hflip(struct ov2680_dev *sensor, s32 val) 
	if (sensor->is_streaming)

		return -EBUSY;



	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2,

			     BIT(2), val ? BIT(2) : 0);

	ret = cci_update_bits(sensor->regmap, OV2680_REG_FORMAT2,

			      BIT(2), val ? BIT(2) : 0, NULL);

	if (ret < 0)

		return ret;
@@ -378,48 +261,48 @@ static int ov2680_set_hflip(struct ov2680_dev *sensor, s32 val) 


static int ov2680_test_pattern_set(struct ov2680_dev *sensor, int value)

{

	int ret;

	int ret = 0;



	if (!value)

		return ov2680_mod_reg(sensor, OV2680_REG_ISP_CTRL00, BIT(7), 0);

		return cci_update_bits(sensor->regmap, OV2680_REG_ISP_CTRL00,

				       BIT(7), 0, NULL);



	ret = ov2680_mod_reg(sensor, OV2680_REG_ISP_CTRL00, 0x03, value - 1);

	if (ret < 0)

		return ret;

	cci_update_bits(sensor->regmap, OV2680_REG_ISP_CTRL00,

			0x03, value - 1, &ret);

	cci_update_bits(sensor->regmap, OV2680_REG_ISP_CTRL00,

			BIT(7), BIT(7), &ret);



	ret = ov2680_mod_reg(sensor, OV2680_REG_ISP_CTRL00, BIT(7), BIT(7));

	if (ret < 0)

	return ret;



	return 0;

}



static int ov2680_gain_set(struct ov2680_dev *sensor, u32 gain)

{

	return ov2680_write_reg16(sensor, OV2680_REG_GAIN_PK, gain);

	return cci_write(sensor->regmap, OV2680_REG_GAIN_PK, gain, NULL);

}



static int ov2680_exposure_set(struct ov2680_dev *sensor, u32 exp)

{

	return ov2680_write_reg24(sensor, OV2680_REG_EXPOSURE_PK_HIGH,

				  exp << 4);

	return cci_write(sensor->regmap, OV2680_REG_EXPOSURE_PK, exp << 4,

			 NULL);

}



static int ov2680_stream_enable(struct ov2680_dev *sensor)

{

	return ov2680_write_reg(sensor, OV2680_REG_STREAM_CTRL, 1);

	return cci_write(sensor->regmap, OV2680_REG_STREAM_CTRL, 1, NULL);

}



static int ov2680_stream_disable(struct ov2680_dev *sensor)

{

	return ov2680_write_reg(sensor, OV2680_REG_STREAM_CTRL, 0);

	return cci_write(sensor->regmap, OV2680_REG_STREAM_CTRL, 0, NULL);

}



static int ov2680_mode_set(struct ov2680_dev *sensor)

{

	int ret;



	ret = ov2680_load_regs(sensor, sensor->current_mode);

	ret = regmap_multi_reg_write(sensor->regmap,

				     sensor->current_mode->reg_data,

				     sensor->current_mode->reg_data_size);

	if (ret < 0)

		return ret;
@@ -437,7 +320,9 @@ static int ov2680_mode_restore(struct ov2680_dev *sensor) 
{

	int ret;



	ret = ov2680_load_regs(sensor, &ov2680_mode_init_data);

	ret = regmap_multi_reg_write(sensor->regmap,

				     ov2680_mode_init_data.reg_data,

				     ov2680_mode_init_data.reg_data_size);

	if (ret < 0)

		return ret;
@@ -472,7 +357,8 @@ static int ov2680_power_on(struct ov2680_dev *sensor) 
	}



	if (!sensor->reset_gpio) {

		ret = ov2680_write_reg(sensor, OV2680_REG_SOFT_RESET, 0x01);

		ret = cci_write(sensor->regmap, OV2680_REG_SOFT_RESET, 0x01,

				NULL);

		if (ret != 0) {

			dev_err(dev, "sensor soft reset failed\n");

			goto err_disable_regulators;
@@ -841,19 +727,19 @@ static int ov2680_get_regulators(struct ov2680_dev *sensor) 
static int ov2680_check_id(struct ov2680_dev *sensor)

{

	struct device *dev = ov2680_to_dev(sensor);

	u32 chip_id;

	u64 chip_id;

	int ret;



	ov2680_power_on(sensor);



	ret = ov2680_read_reg16(sensor, OV2680_REG_CHIP_ID_HIGH, &chip_id);

	ret = cci_read(sensor->regmap, OV2680_REG_CHIP_ID, &chip_id, NULL);

	if (ret < 0) {

		dev_err(dev, "failed to read chip id high\n");

		dev_err(dev, "failed to read chip id\n");

		return -ENODEV;

	}



	if (chip_id != OV2680_CHIP_ID) {

		dev_err(dev, "chip id: 0x%04x does not match expected 0x%04x\n",

		dev_err(dev, "chip id: 0x%04llx does not match expected 0x%04x\n",

			chip_id, OV2680_CHIP_ID);

		return -ENODEV;

	}
@@ -902,6 +788,10 @@ static int ov2680_probe(struct i2c_client *client) 


	sensor->i2c_client = client;



	sensor->regmap = devm_cci_regmap_init_i2c(client, 16);

	if (IS_ERR(sensor->regmap))

		return PTR_ERR(sensor->regmap);



	ret = ov2680_parse_dt(sensor);

	if (ret < 0)

		return -EINVAL;