leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] cs5345: use the control framework

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2010-12-12 07:53:28 -03:00 committed by Mauro Carvalho Chehab
parent 1f075d1f1b
commit 34a078da8e
1 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
drivers/media/video/cs5345.c
View File

@ -25,6 +25,7 @@
#include <linux/slab.h> #include <linux/slab.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>
MODULE_DESCRIPTION("i2c device driver for cs5345 Audio ADC"); MODULE_DESCRIPTION("i2c device driver for cs5345 Audio ADC");
MODULE_AUTHOR("Hans Verkuil"); MODULE_AUTHOR("Hans Verkuil");
@ -36,6 +37,20 @@ 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 cs5345_state {
struct v4l2_subdev sd;
struct v4l2_ctrl_handler hdl;
};
static inline struct cs5345_state *to_state(struct v4l2_subdev *sd)
{
return container_of(sd, struct cs5345_state, sd);
}
static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
{
return &container_of(ctrl->handler, struct cs5345_state, hdl)->sd;
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -65,33 +80,20 @@ static int cs5345_s_routing(struct v4l2_subdev *sd,
return 0; return 0;
} }
static int cs5345_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) static int cs5345_s_ctrl(struct v4l2_ctrl *ctrl)
{ {
if (ctrl->id == V4L2_CID_AUDIO_MUTE) { struct v4l2_subdev *sd = to_sd(ctrl);
ctrl->value = (cs5345_read(sd, 0x04) & 0x08) != 0;
return 0;
}
if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
return -EINVAL;
ctrl->value = cs5345_read(sd, 0x07) & 0x3f;
if (ctrl->value >= 32)
ctrl->value = ctrl->value - 64;
return 0;
}
static int cs5345_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) { cs5345_write(sd, 0x04, ctrl->val ? 0x80 : 0);
cs5345_write(sd, 0x04, ctrl->value ? 0x80 : 0); return 0;
case V4L2_CID_AUDIO_VOLUME:
cs5345_write(sd, 0x07, ((u8)ctrl->val) & 0x3f);
cs5345_write(sd, 0x08, ((u8)ctrl->val) & 0x3f);
return 0; return 0;
} }
if (ctrl->id != V4L2_CID_AUDIO_VOLUME) return -EINVAL;
return -EINVAL;
if (ctrl->value > 24 || ctrl->value < -24)
return -EINVAL;
cs5345_write(sd, 0x07, ((u8)ctrl->value) & 0x3f);
cs5345_write(sd, 0x08, ((u8)ctrl->value) & 0x3f);
return 0;
} }
#ifdef CONFIG_VIDEO_ADV_DEBUG #ifdef CONFIG_VIDEO_ADV_DEBUG
@ -144,11 +146,20 @@ static int cs5345_log_status(struct v4l2_subdev *sd)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static const struct v4l2_ctrl_ops cs5345_ctrl_ops = {
.s_ctrl = cs5345_s_ctrl,
};
static const struct v4l2_subdev_core_ops cs5345_core_ops = { static const struct v4l2_subdev_core_ops cs5345_core_ops = {
.log_status = cs5345_log_status, .log_status = cs5345_log_status,
.g_chip_ident = cs5345_g_chip_ident, .g_chip_ident = cs5345_g_chip_ident,
.g_ctrl = cs5345_g_ctrl, .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
.s_ctrl = cs5345_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,
#ifdef CONFIG_VIDEO_ADV_DEBUG #ifdef CONFIG_VIDEO_ADV_DEBUG
.g_register = cs5345_g_register, .g_register = cs5345_g_register,
.s_register = cs5345_s_register, .s_register = cs5345_s_register,
@ -169,6 +180,7 @@ static const struct v4l2_subdev_ops cs5345_ops = {
static int cs5345_probe(struct i2c_client *client, static int cs5345_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct cs5345_state *state;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
/* Check if the adapter supports the needed features */ /* Check if the adapter supports the needed features */
@ -178,11 +190,28 @@ static int cs5345_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 = kzalloc(sizeof(struct v4l2_subdev), GFP_KERNEL); state = kzalloc(sizeof(struct cs5345_state), GFP_KERNEL);
if (sd == NULL) if (state == NULL)
return -ENOMEM; return -ENOMEM;
sd = &state->sd;
v4l2_i2c_subdev_init(sd, client, &cs5345_ops); v4l2_i2c_subdev_init(sd, client, &cs5345_ops);
v4l2_ctrl_handler_init(&state->hdl, 2);
v4l2_ctrl_new_std(&state->hdl, &cs5345_ctrl_ops,
V4L2_CID_AUDIO_MUTE, 0, 1, 1, 0);
v4l2_ctrl_new_std(&state->hdl, &cs5345_ctrl_ops,
V4L2_CID_AUDIO_VOLUME, -24, 24, 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 volume/mute */
v4l2_ctrl_handler_setup(&state->hdl);
cs5345_write(sd, 0x02, 0x00); cs5345_write(sd, 0x02, 0x00);
cs5345_write(sd, 0x04, 0x01); cs5345_write(sd, 0x04, 0x01);
cs5345_write(sd, 0x09, 0x01); cs5345_write(sd, 0x09, 0x01);
@ -194,9 +223,11 @@ static int cs5345_probe(struct i2c_client *client,
static int cs5345_remove(struct i2c_client *client) static int cs5345_remove(struct i2c_client *client)
{ {
struct v4l2_subdev *sd = i2c_get_clientdata(client); struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct cs5345_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;
} }