Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6be89daa authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] soc_camera sensors: remove g_chip_ident op 



This is no longer needed since the core now handles this through DBG_G_CHIP_INFO.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cc3590db

drivers/media/i2c/soc_camera/imx074.c

+0 −19
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <media/soc_camera.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-chip-ident.h>



/* IMX074 registers */
@@ -251,23 +250,6 @@ static int imx074_s_stream(struct v4l2_subdev *sd, int enable) 
	return reg_write(client, MODE_SELECT, !!enable);

}



static int imx074_g_chip_ident(struct v4l2_subdev *sd,

			       struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)

		return -EINVAL;



	if (id->match.addr != client->addr)

		return -ENODEV;



	id->ident	= V4L2_IDENT_IMX074;

	id->revision	= 0;



	return 0;

}



static int imx074_s_power(struct v4l2_subdev *sd, int on)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -299,7 +281,6 @@ static struct v4l2_subdev_video_ops imx074_subdev_video_ops = { 
};



static struct v4l2_subdev_core_ops imx074_subdev_core_ops = {

	.g_chip_ident	= imx074_g_chip_ident,

	.s_power	= imx074_s_power,

};

drivers/media/i2c/soc_camera/mt9m001.c

+2 −31
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-ctrls.h>



/*
@@ -97,7 +96,6 @@ struct mt9m001 { 
	const struct mt9m001_datafmt *fmt;

	const struct mt9m001_datafmt *fmts;

	int num_fmts;

	int model;	/* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */

	unsigned int total_h;

	unsigned short y_skip_top;	/* Lines to skip at the top */

};
@@ -320,36 +318,15 @@ static int mt9m001_try_fmt(struct v4l2_subdev *sd, 
	return 0;

}



static int mt9m001_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)

		return -EINVAL;



	if (id->match.addr != client->addr)

		return -ENODEV;



	id->ident	= mt9m001->model;

	id->revision	= 0;



	return 0;

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int mt9m001_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

	if (reg->reg > 0xff)

		return -EINVAL;



	if (reg->match.addr != client->addr)

		return -ENODEV;



	reg->size = 2;

	reg->val = reg_read(client, reg->reg);
@@ -364,12 +341,9 @@ static int mt9m001_s_register(struct v4l2_subdev *sd, 
{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

	if (reg->reg > 0xff)

		return -EINVAL;



	if (reg->match.addr != client->addr)

		return -ENODEV;



	if (reg_write(client, reg->reg, reg->val) < 0)

		return -EIO;
@@ -505,11 +479,9 @@ static int mt9m001_video_probe(struct soc_camera_subdev_desc *ssdd, 
	switch (data) {

	case 0x8411:

	case 0x8421:

		mt9m001->model = V4L2_IDENT_MT9M001C12ST;

		mt9m001->fmts = mt9m001_colour_fmts;

		break;

	case 0x8431:

		mt9m001->model = V4L2_IDENT_MT9M001C12STM;

		mt9m001->fmts = mt9m001_monochrome_fmts;

		break;

	default:
@@ -580,7 +552,6 @@ static const struct v4l2_ctrl_ops mt9m001_ctrl_ops = { 
};



static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {

	.g_chip_ident	= mt9m001_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register	= mt9m001_g_register,

	.s_register	= mt9m001_s_register,

drivers/media/i2c/soc_camera/mt9m111.c

+2 −31
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <media/soc_camera.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-chip-ident.h>



/*

 * MT9M111, MT9M112 and MT9M131:
@@ -205,8 +204,6 @@ struct mt9m111 { 
	struct v4l2_subdev subdev;

	struct v4l2_ctrl_handler hdl;

	struct v4l2_ctrl *gain;

	int model;	/* V4L2_IDENT_MT9M111 or V4L2_IDENT_MT9M112 code

			 * from v4l2-chip-ident.h */

	struct mt9m111_context *ctx;

	struct v4l2_rect rect;	/* cropping rectangle */

	int width;		/* output */
@@ -600,24 +597,6 @@ static int mt9m111_s_fmt(struct v4l2_subdev *sd, 
	return ret;

}



static int mt9m111_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)

		return -EINVAL;



	if (id->match.addr != client->addr)

		return -ENODEV;



	id->ident	= mt9m111->model;

	id->revision	= 0;



	return 0;

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int mt9m111_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)
@@ -625,10 +604,8 @@ static int mt9m111_g_register(struct v4l2_subdev *sd, 
	struct i2c_client *client = v4l2_get_subdevdata(sd);

	int val;



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)

	if (reg->reg > 0x2ff)

		return -EINVAL;

	if (reg->match.addr != client->addr)

		return -ENODEV;



	val = mt9m111_reg_read(client, reg->reg);

	reg->size = 2;
@@ -645,12 +622,9 @@ static int mt9m111_s_register(struct v4l2_subdev *sd, 
{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)

	if (reg->reg > 0x2ff)

		return -EINVAL;



	if (reg->match.addr != client->addr)

		return -ENODEV;



	if (mt9m111_reg_write(client, reg->reg, reg->val) < 0)

		return -EIO;
@@ -856,7 +830,6 @@ static const struct v4l2_ctrl_ops mt9m111_ctrl_ops = { 
};



static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {

	.g_chip_ident	= mt9m111_g_chip_ident,

	.s_power	= mt9m111_s_power,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register	= mt9m111_g_register,
@@ -923,12 +896,10 @@ static int mt9m111_video_probe(struct i2c_client *client) 


	switch (data) {

	case 0x143a: /* MT9M111 or MT9M131 */

		mt9m111->model = V4L2_IDENT_MT9M111;

		dev_info(&client->dev,

			"Detected a MT9M111/MT9M131 chip ID %x\n", data);

		break;

	case 0x148c: /* MT9M112 */

		mt9m111->model = V4L2_IDENT_MT9M112;

		dev_info(&client->dev, "Detected a MT9M112 chip ID %x\n", data);

		break;

	default:

drivers/media/i2c/soc_camera/mt9t031.c

+2 −30
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/module.h>



#include <media/soc_camera.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-ctrls.h>
@@ -76,7 +75,6 @@ struct mt9t031 { 
		struct v4l2_ctrl *exposure;

	};

	struct v4l2_rect rect;	/* Sensor window */

	int model;	/* V4L2_IDENT_MT9T031* codes from v4l2-chip-ident.h */

	u16 xskip;

	u16 yskip;

	unsigned int total_h;
@@ -391,36 +389,15 @@ static int mt9t031_try_fmt(struct v4l2_subdev *sd, 
	return 0;

}



static int mt9t031_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)

		return -EINVAL;



	if (id->match.addr != client->addr)

		return -ENODEV;



	id->ident	= mt9t031->model;

	id->revision	= 0;



	return 0;

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int mt9t031_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

	if (reg->reg > 0xff)

		return -EINVAL;



	if (reg->match.addr != client->addr)

		return -ENODEV;



	reg->val = reg_read(client, reg->reg);



	if (reg->val > 0xffff)
@@ -434,12 +411,9 @@ static int mt9t031_s_register(struct v4l2_subdev *sd, 
{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

	if (reg->reg > 0xff)

		return -EINVAL;



	if (reg->match.addr != client->addr)

		return -ENODEV;



	if (reg_write(client, reg->reg, reg->val) < 0)

		return -EIO;
@@ -650,7 +624,6 @@ static int mt9t031_video_probe(struct i2c_client *client) 


	switch (data) {

	case 0x1621:

		mt9t031->model = V4L2_IDENT_MT9T031;

		break;

	default:

		dev_err(&client->dev,
@@ -685,7 +658,6 @@ static const struct v4l2_ctrl_ops mt9t031_ctrl_ops = { 
};



static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {

	.g_chip_ident	= mt9t031_g_chip_ident,

	.s_power	= mt9t031_s_power,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register	= mt9t031_g_register,

drivers/media/i2c/soc_camera/mt9t112.c

+0 −16
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include <media/mt9t112.h>

#include <media/soc_camera.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-common.h>



/* you can check PLL/clock info */
@@ -91,7 +90,6 @@ struct mt9t112_priv { 
	struct i2c_client		*client;

	struct v4l2_rect		 frame;

	const struct mt9t112_format	*format;

	int				 model;

	int				 num_formats;

	u32				 flags;

/* for flags */
@@ -738,17 +736,6 @@ static int mt9t112_init_camera(const struct i2c_client *client) 
/************************************************************************

			v4l2_subdev_core_ops

************************************************************************/

static int mt9t112_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t112_priv *priv = to_mt9t112(client);



	id->ident    = priv->model;

	id->revision = 0;



	return 0;

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int mt9t112_g_register(struct v4l2_subdev *sd,
@@ -786,7 +773,6 @@ static int mt9t112_s_power(struct v4l2_subdev *sd, int on) 
}



static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {

	.g_chip_ident	= mt9t112_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register	= mt9t112_g_register,

	.s_register	= mt9t112_s_register,
@@ -1061,12 +1047,10 @@ static int mt9t112_camera_probe(struct i2c_client *client) 
	switch (chipid) {

	case 0x2680:

		devname = "mt9t111";

		priv->model = V4L2_IDENT_MT9T111;

		priv->num_formats = 1;

		break;

	case 0x2682:

		devname = "mt9t112";

		priv->model = V4L2_IDENT_MT9T112;

		priv->num_formats = ARRAY_SIZE(mt9t112_cfmts);

		break;

	default: