lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (6452): wm8775: convert to bus-based I2C API

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
2007-09-13 11:08:25 -03:00
committed by Mauro Carvalho Chehab
parent 8ffbc65594
commit d9a53aa902
1 changed files with 15 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/media/video/wm8775.c
View File

@@ -34,6 +34,7 @@
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h> #include <media/v4l2-chip-ident.h>
#include <media/v4l2-i2c-drv-legacy.h>
MODULE_DESCRIPTION("wm8775 driver"); MODULE_DESCRIPTION("wm8775 driver");
MODULE_AUTHOR("Ulf Eklund, Hans Verkuil"); MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
@@ -44,6 +45,7 @@ static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD; I2C_CLIENT_INSMOD;
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
enum { enum {
@@ -76,8 +78,7 @@ static int wm8775_write(struct i2c_client *client, int reg, u16 val)
return -1; return -1;
} }
static int wm8775_command(struct i2c_client *client, unsigned int cmd, static int wm8775_command(struct i2c_client *client, unsigned int cmd, void *arg)
void *arg)
{ {
struct wm8775_state *state = i2c_get_clientdata(client); struct wm8775_state *state = i2c_get_clientdata(client);
struct v4l2_routing *route = arg; struct v4l2_routing *route = arg;
@@ -159,31 +160,18 @@ static int wm8775_command(struct i2c_client *client, unsigned int cmd,
* concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1' * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
*/ */
static struct i2c_driver i2c_driver; static int wm8775_probe(struct i2c_client *client)
static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
{ {
struct i2c_client *client;
struct wm8775_state *state; struct wm8775_state *state;
/* Check if the adapter supports the needed features */ /* Check if the adapter supports the needed features */
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return 0; return -EIO;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name);
if (client == 0)
return -ENOMEM;
client->addr = address;
client->adapter = adapter;
client->driver = &i2c_driver;
snprintf(client->name, sizeof(client->name) - 1, "wm8775");
v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name);
state = kmalloc(sizeof(struct wm8775_state), GFP_KERNEL); state = kmalloc(sizeof(struct wm8775_state), GFP_KERNEL);
if (state == NULL) { if (state == NULL) {
kfree(client);
return -ENOMEM; return -ENOMEM;
} }
state->input = 2; state->input = 2;
@@ -208,56 +196,20 @@ static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
wm8775_write(client, R20, 0x07a); /* Transient window 4ms, lower PGA gain */ wm8775_write(client, R20, 0x07a); /* Transient window 4ms, lower PGA gain */
/* limit -1dB */ /* limit -1dB */
wm8775_write(client, R21, 0x102); /* LRBOTH = 1, use input 2. */ wm8775_write(client, R21, 0x102); /* LRBOTH = 1, use input 2. */
i2c_attach_client(client);
return 0; return 0;
} }
static int wm8775_probe(struct i2c_adapter *adapter) static int wm8775_remove(struct i2c_client *client)
{ {
if (adapter->class & I2C_CLASS_TV_ANALOG) kfree(i2c_get_clientdata(client));
return i2c_probe(adapter, &addr_data, wm8775_attach);
return 0; return 0;
} }
static int wm8775_detach(struct i2c_client *client) static struct v4l2_i2c_driver_data v4l2_i2c_data = {
{ .name = "wm8775",
struct wm8775_state *state = i2c_get_clientdata(client); .driverid = I2C_DRIVERID_WM8775,
int err; .command = wm8775_command,
.probe = wm8775_probe,
err = i2c_detach_client(client); .remove = wm8775_remove,
if (err) {
return err;
}
kfree(state);
kfree(client);
return 0;
}
/* ----------------------------------------------------------------------- */
/* i2c implementation */
static struct i2c_driver i2c_driver = {
.driver = {
.name = "wm8775",
},
.id = I2C_DRIVERID_WM8775,
.attach_adapter = wm8775_probe,
.detach_client = wm8775_detach,
.command = wm8775_command,
}; };
static int __init wm8775_init_module(void)
{
return i2c_add_driver(&i2c_driver);
}
static void __exit wm8775_cleanup_module(void)
{
i2c_del_driver(&i2c_driver);
}
module_init(wm8775_init_module);
module_exit(wm8775_cleanup_module);