V4L/DVB: cs53l32a: convert to new control framework (251190cf) · Commits · e / devices / android_kernel_samsung_smdk4412

drivers/media/video/cs53l32a.c

+68 −39

Original line number	Original line	Diff line number	Diff line
	@@ -26,10 +26,10 @@
	#include <linux/ioctl.h>		#include <linux/ioctl.h>
	#include <asm/uaccess.h>		#include <asm/uaccess.h>
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/i2c-id.h>
	#include <linux/videodev2.h>		#include <linux/videodev2.h>
	#include <media/v4l2-device.h>		#include <media/v4l2-device.h>
	#include <media/v4l2-chip-ident.h>		#include <media/v4l2-chip-ident.h>
			#include <media/v4l2-ctrls.h>
	#include <media/v4l2-i2c-drv.h>		#include <media/v4l2-i2c-drv.h>

	MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");		MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
	@@ -43,6 +43,21 @@ module_param(debug, bool, 0644);
	MODULE_PARM_DESC(debug, "Debugging messages, 0=Off (default), 1=On");		MODULE_PARM_DESC(debug, "Debugging messages, 0=Off (default), 1=On");


			struct cs53l32a_state {
			struct v4l2_subdev sd;
			struct v4l2_ctrl_handler hdl;
			};

			static inline struct cs53l32a_state to_state(struct v4l2_subdev sd)
			{
			return container_of(sd, struct cs53l32a_state, sd);
			}

			static inline struct v4l2_subdev to_sd(struct v4l2_ctrl ctrl)
			{
			return &container_of(ctrl->handler, struct cs53l32a_state, hdl)->sd;
			}

	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

	static int cs53l32a_write(struct v4l2_subdev *sd, u8 reg, u8 value)		static int cs53l32a_write(struct v4l2_subdev *sd, u8 reg, u8 value)
	@@ -74,31 +89,20 @@ static int cs53l32a_s_routing(struct v4l2_subdev *sd,
	return 0;		return 0;
	}		}

	static int cs53l32a_g_ctrl(struct v4l2_subdev sd, struct v4l2_control ctrl)		static int cs53l32a_s_ctrl(struct v4l2_ctrl *ctrl)
	{		{
	if (ctrl->id == V4L2_CID_AUDIO_MUTE) {		struct v4l2_subdev *sd = to_sd(ctrl);
	ctrl->value = (cs53l32a_read(sd, 0x03) & 0xc0) != 0;
	return 0;
	}
	if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
	return -EINVAL;
	ctrl->value = (s8)cs53l32a_read(sd, 0x04);
	return 0;
	}

	static int cs53l32a_s_ctrl(struct v4l2_subdev sd, struct v4l2_control ctrl)		switch (ctrl->id) {
	{		case V4L2_CID_AUDIO_MUTE:
	if (ctrl->id == V4L2_CID_AUDIO_MUTE) {		cs53l32a_write(sd, 0x03, ctrl->val ? 0xf0 : 0x30);
	cs53l32a_write(sd, 0x03, ctrl->value ? 0xf0 : 0x30);		return 0;
			case V4L2_CID_AUDIO_VOLUME:
			cs53l32a_write(sd, 0x04, (u8)ctrl->val);
			cs53l32a_write(sd, 0x05, (u8)ctrl->val);
	return 0;		return 0;
	}		}
	if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
	return -EINVAL;		return -EINVAL;
	if (ctrl->value > 12 \|\| ctrl->value < -96)
	return -EINVAL;
	cs53l32a_write(sd, 0x04, (u8) ctrl->value);
	cs53l32a_write(sd, 0x05, (u8) ctrl->value);
	return 0;
	}		}

	static int cs53l32a_g_chip_ident(struct v4l2_subdev sd, struct v4l2_dbg_chip_ident chip)		static int cs53l32a_g_chip_ident(struct v4l2_subdev sd, struct v4l2_dbg_chip_ident chip)
	@@ -111,23 +115,30 @@ static int cs53l32a_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_id

	static int cs53l32a_log_status(struct v4l2_subdev *sd)		static int cs53l32a_log_status(struct v4l2_subdev *sd)
	{		{
			struct cs53l32a_state *state = to_state(sd);
	u8 v = cs53l32a_read(sd, 0x01);		u8 v = cs53l32a_read(sd, 0x01);
	u8 m = cs53l32a_read(sd, 0x03);
	s8 vol = cs53l32a_read(sd, 0x04);

	v4l2_info(sd, "Input: %d%s\n", (v >> 4) & 3,		v4l2_info(sd, "Input: %d\n", (v >> 4) & 3);
	(m & 0xC0) ? " (muted)" : "");		v4l2_ctrl_handler_log_status(&state->hdl, sd->name);
	v4l2_info(sd, "Volume: %d dB\n", vol);
	return 0;		return 0;
	}		}

	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

			static const struct v4l2_ctrl_ops cs53l32a_ctrl_ops = {
			.s_ctrl = cs53l32a_s_ctrl,
			};

	static const struct v4l2_subdev_core_ops cs53l32a_core_ops = {		static const struct v4l2_subdev_core_ops cs53l32a_core_ops = {
	.log_status = cs53l32a_log_status,		.log_status = cs53l32a_log_status,
	.g_chip_ident = cs53l32a_g_chip_ident,		.g_chip_ident = cs53l32a_g_chip_ident,
	.g_ctrl = cs53l32a_g_ctrl,		.g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
	.s_ctrl = cs53l32a_s_ctrl,		.try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
			.s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
			.g_ctrl = v4l2_subdev_g_ctrl,
			.s_ctrl = v4l2_subdev_s_ctrl,
			.queryctrl = v4l2_subdev_queryctrl,
			.querymenu = v4l2_subdev_querymenu,
	};		};

	static const struct v4l2_subdev_audio_ops cs53l32a_audio_ops = {		static const struct v4l2_subdev_audio_ops cs53l32a_audio_ops = {
	@@ -151,6 +162,7 @@ static const struct v4l2_subdev_ops cs53l32a_ops = {
	static int cs53l32a_probe(struct i2c_client *client,		static int cs53l32a_probe(struct i2c_client *client,
	const struct i2c_device_id *id)		const struct i2c_device_id *id)
	{		{
			struct cs53l32a_state *state;
	struct v4l2_subdev *sd;		struct v4l2_subdev *sd;
	int i;		int i;

	@@ -164,9 +176,10 @@ static int cs53l32a_probe(struct i2c_client *client,
	v4l_info(client, "chip found @ 0x%x (%s)\n",		v4l_info(client, "chip found @ 0x%x (%s)\n",
	client->addr << 1, client->adapter->name);		client->addr << 1, client->adapter->name);

	sd = kmalloc(sizeof(struct v4l2_subdev), GFP_KERNEL);		state = kzalloc(sizeof(struct cs53l32a_state), GFP_KERNEL);
	if (sd == NULL)		if (state == NULL)
	return -ENOMEM;		return -ENOMEM;
			sd = &state->sd;
	v4l2_i2c_subdev_init(sd, client, &cs53l32a_ops);		v4l2_i2c_subdev_init(sd, client, &cs53l32a_ops);

	for (i = 1; i <= 7; i++) {		for (i = 1; i <= 7; i++) {
	@@ -175,15 +188,29 @@ static int cs53l32a_probe(struct i2c_client *client,
	v4l2_dbg(1, debug, sd, "Read Reg %d %02x\n", i, v);		v4l2_dbg(1, debug, sd, "Read Reg %d %02x\n", i, v);
	}		}

			v4l2_ctrl_handler_init(&state->hdl, 2);
			v4l2_ctrl_new_std(&state->hdl, &cs53l32a_ctrl_ops,
			V4L2_CID_AUDIO_VOLUME, -96, 12, 1, 0);
			v4l2_ctrl_new_std(&state->hdl, &cs53l32a_ctrl_ops,
			V4L2_CID_AUDIO_MUTE, 0, 1, 1, 0);
			sd->ctrl_handler = &state->hdl;
			if (state->hdl.error) {
			int err = state->hdl.error;

			v4l2_ctrl_handler_free(&state->hdl);
			kfree(state);
			return err;
			}

	/* Set cs53l32a internal register for Adaptec 2010/2410 setup */		/* Set cs53l32a internal register for Adaptec 2010/2410 setup */

	cs53l32a_write(sd, 0x01, (u8) 0x21);		cs53l32a_write(sd, 0x01, 0x21);
	cs53l32a_write(sd, 0x02, (u8) 0x29);		cs53l32a_write(sd, 0x02, 0x29);
	cs53l32a_write(sd, 0x03, (u8) 0x30);		cs53l32a_write(sd, 0x03, 0x30);
	cs53l32a_write(sd, 0x04, (u8) 0x00);		cs53l32a_write(sd, 0x04, 0x00);
	cs53l32a_write(sd, 0x05, (u8) 0x00);		cs53l32a_write(sd, 0x05, 0x00);
	cs53l32a_write(sd, 0x06, (u8) 0x00);		cs53l32a_write(sd, 0x06, 0x00);
	cs53l32a_write(sd, 0x07, (u8) 0x00);		cs53l32a_write(sd, 0x07, 0x00);

	/* Display results, should be 0x21,0x29,0x30,0x00,0x00,0x00,0x00 */		/* Display results, should be 0x21,0x29,0x30,0x00,0x00,0x00,0x00 */

	@@ -198,9 +225,11 @@ static int cs53l32a_probe(struct i2c_client *client,
	static int cs53l32a_remove(struct i2c_client *client)		static int cs53l32a_remove(struct i2c_client *client)
	{		{
	struct v4l2_subdev *sd = i2c_get_clientdata(client);		struct v4l2_subdev *sd = i2c_get_clientdata(client);
			struct cs53l32a_state *state = to_state(sd);

	v4l2_device_unregister_subdev(sd);		v4l2_device_unregister_subdev(sd);
	kfree(sd);		v4l2_ctrl_handler_free(&state->hdl);
			kfree(state);
	return 0;		return 0;
	}		}