Commit 9dd659de authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

V4L/DVB (6556): tuner: convert to bus-based I2C API

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 92de1f16
...@@ -14,7 +14,7 @@ static int debug = 0; ...@@ -14,7 +14,7 @@ static int debug = 0;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages"); MODULE_PARM_DESC(debug, "enable verbose debug messages");
#define PREFIX "mt20xx " #define PREFIX "mt20xx"
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
......
...@@ -31,7 +31,7 @@ static int tuner_debug; ...@@ -31,7 +31,7 @@ static int tuner_debug;
module_param_named(debug, tuner_debug, int, 0644); module_param_named(debug, tuner_debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages"); MODULE_PARM_DESC(debug, "enable verbose debug messages");
#define PREFIX "tda8290 " #define PREFIX "tda8290"
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
......
...@@ -18,7 +18,7 @@ static int debug = 0; ...@@ -18,7 +18,7 @@ static int debug = 0;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages"); MODULE_PARM_DESC(debug, "enable verbose debug messages");
#define PREFIX "tea5761 " #define PREFIX "tea5761"
struct tea5761_priv { struct tea5761_priv {
struct tuner_i2c_props i2c_props; struct tuner_i2c_props i2c_props;
......
...@@ -20,7 +20,7 @@ static int debug = 0; ...@@ -20,7 +20,7 @@ static int debug = 0;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages"); MODULE_PARM_DESC(debug, "enable verbose debug messages");
#define PREFIX "tea5767 " #define PREFIX "tea5767"
/*****************************************************************************/ /*****************************************************************************/
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <media/tuner.h> #include <media/tuner.h>
#include <media/tuner-types.h> #include <media/tuner-types.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-i2c-drv-legacy.h>
#include "tuner-driver.h" #include "tuner-driver.h"
#include "mt20xx.h" #include "mt20xx.h"
#include "tda8290.h" #include "tda8290.h"
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
#define UNSET (-1U) #define UNSET (-1U)
#define PREFIX "tuner " #define PREFIX t->i2c->driver->driver.name
/* standard i2c insmod options */ /* standard i2c insmod options */
static unsigned short normal_i2c[] = { static unsigned short normal_i2c[] = {
...@@ -75,9 +76,6 @@ MODULE_DESCRIPTION("device driver for various TV and TV+FM radio tuners"); ...@@ -75,9 +76,6 @@ MODULE_DESCRIPTION("device driver for various TV and TV+FM radio tuners");
MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer"); MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static struct i2c_driver driver;
static struct i2c_client client_template;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void fe_set_freq(struct dvb_frontend *fe, unsigned int freq) static void fe_set_freq(struct dvb_frontend *fe, unsigned int freq)
...@@ -919,18 +917,18 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -919,18 +917,18 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
static int tuner_suspend(struct i2c_client *c, pm_message_t state) static int tuner_suspend(struct i2c_client *c, pm_message_t state)
{ {
struct tuner *t = i2c_get_clientdata (c); struct tuner *t = i2c_get_clientdata(c);
tuner_dbg ("suspend\n"); tuner_dbg("suspend\n");
/* FIXME: power down ??? */ /* FIXME: power down ??? */
return 0; return 0;
} }
static int tuner_resume(struct i2c_client *c) static int tuner_resume(struct i2c_client *c)
{ {
struct tuner *t = i2c_get_clientdata (c); struct tuner *t = i2c_get_clientdata(c);
tuner_dbg ("resume\n"); tuner_dbg("resume\n");
if (V4L2_TUNER_RADIO == t->mode) { if (V4L2_TUNER_RADIO == t->mode) {
if (t->radio_freq) if (t->radio_freq)
set_freq(c, t->radio_freq); set_freq(c, t->radio_freq);
...@@ -946,7 +944,7 @@ static int tuner_resume(struct i2c_client *c) ...@@ -946,7 +944,7 @@ static int tuner_resume(struct i2c_client *c)
LIST_HEAD(tuner_list); LIST_HEAD(tuner_list);
/* Search for existing radio and/or TV tuners on the given I2C adapter. /* Search for existing radio and/or TV tuners on the given I2C adapter.
Note that when this function is called from tuner_attach you can be Note that when this function is called from tuner_probe you can be
certain no other devices will be added/deleted at the same time, I2C certain no other devices will be added/deleted at the same time, I2C
core protects against that. */ core protects against that. */
static void tuner_lookup(struct i2c_adapter *adap, static void tuner_lookup(struct i2c_adapter *adap,
...@@ -977,28 +975,19 @@ static void tuner_lookup(struct i2c_adapter *adap, ...@@ -977,28 +975,19 @@ static void tuner_lookup(struct i2c_adapter *adap,
} }
/* During client attach, set_type is called by adapter's attach_inform callback. /* During client attach, set_type is called by adapter's attach_inform callback.
set_type must then be completed by tuner_attach. set_type must then be completed by tuner_probe.
*/ */
static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) static int tuner_probe(struct i2c_client *client)
{ {
struct i2c_client *client;
struct tuner *t; struct tuner *t;
struct tuner *radio; struct tuner *radio;
struct tuner *tv; struct tuner *tv;
client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (NULL == client)
return -ENOMEM;
t = kzalloc(sizeof(struct tuner), GFP_KERNEL); t = kzalloc(sizeof(struct tuner), GFP_KERNEL);
if (NULL == t) { if (NULL == t)
kfree(client);
return -ENOMEM; return -ENOMEM;
}
t->i2c = client; t->i2c = client;
client_template.adapter = adap; strlcpy(client->name, "(tuner unset)", sizeof(client->name));
client_template.addr = addr;
memcpy(client, &client_template, sizeof(struct i2c_client));
i2c_set_clientdata(client, t); i2c_set_clientdata(client, t);
t->type = UNSET; t->type = UNSET;
t->audmode = V4L2_TUNER_MODE_STEREO; t->audmode = V4L2_TUNER_MODE_STEREO;
...@@ -1015,14 +1004,16 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1015,14 +1004,16 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
printk(KERN_CONT "%02x ", buffer[i]); printk(KERN_CONT "%02x ", buffer[i]);
printk("\n"); printk("\n");
} }
/* HACK: This test were added to avoid tuner to probe tda9840 and /* HACK: This test was added to avoid tuner to probe tda9840 and
tea6415c on the MXB card */ tea6415c on the MXB card */
if (adap->id == I2C_HW_SAA7146 && addr < 0x4a) if (client->adapter->id == I2C_HW_SAA7146 && client->addr < 0x4a) {
kfree(t);
return -ENODEV; return -ENODEV;
}
/* autodetection code based on the i2c addr */ /* autodetection code based on the i2c addr */
if (!no_autodetect) { if (!no_autodetect) {
switch (addr) { switch (client->addr) {
case 0x10: case 0x10:
if (tea5761_autodetection(t->i2c->adapter, t->i2c->addr) if (tea5761_autodetection(t->i2c->adapter, t->i2c->addr)
!= EINVAL) { != EINVAL) {
...@@ -1092,7 +1083,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1092,7 +1083,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
/* Should be just before return */ /* Should be just before return */
register_client: register_client:
tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name); tuner_info("chip found @ 0x%x (%s)\n", client->addr << 1,
client->adapter->name);
/* Sets a default mode */ /* Sets a default mode */
if (t->mode_mask & T_ANALOG_TV) { if (t->mode_mask & T_ANALOG_TV) {
...@@ -1102,19 +1094,21 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1102,19 +1094,21 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
} else { } else {
t->mode = T_DIGITAL_TV; t->mode = T_DIGITAL_TV;
} }
i2c_attach_client(client);
set_type(client, t->type, t->mode_mask, t->config, t->tuner_callback); set_type(client, t->type, t->mode_mask, t->config, t->tuner_callback);
list_add_tail(&t->list, &tuner_list);
return 0; return 0;
} }
static int tuner_probe(struct i2c_adapter *adap) static int tuner_legacy_probe(struct i2c_adapter *adap)
{ {
if (0 != addr) { if (0 != addr) {
normal_i2c[0] = addr; normal_i2c[0] = addr;
normal_i2c[1] = I2C_CLIENT_END; normal_i2c[1] = I2C_CLIENT_END;
} }
if ((adap->class & I2C_CLASS_TV_ANALOG) == 0)
return 0;
/* HACK: Ignore 0x6b and 0x6f on cx88 boards. /* HACK: Ignore 0x6b and 0x6f on cx88 boards.
* FusionHDTV5 RT Gold has an ir receiver at 0x6b * FusionHDTV5 RT Gold has an ir receiver at 0x6b
* and an RTC at 0x6f which can get corrupted if probed. * and an RTC at 0x6f which can get corrupted if probed.
...@@ -1136,64 +1130,35 @@ static int tuner_probe(struct i2c_adapter *adap) ...@@ -1136,64 +1130,35 @@ static int tuner_probe(struct i2c_adapter *adap)
"too many options specified " "too many options specified "
"in i2c probe ignore list!\n"); "in i2c probe ignore list!\n");
} }
return 1;
if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, tuner_attach);
return 0;
} }
static int tuner_detach(struct i2c_client *client) static int tuner_remove(struct i2c_client *client)
{ {
struct tuner *t = i2c_get_clientdata(client); struct tuner *t = i2c_get_clientdata(client);
struct analog_tuner_ops *ops = t->fe.ops.analog_demod_ops; struct analog_tuner_ops *ops = t->fe.ops.analog_demod_ops;
int err;
err = i2c_detach_client(t->i2c);
if (err) {
tuner_warn
("Client deregistration failed, client not detached.\n");
return err;
}
if (ops && ops->release) if (ops && ops->release)
ops->release(&t->fe); ops->release(&t->fe);
list_del(&t->list); list_del(&t->list);
kfree(t); kfree(t);
kfree(client);
return 0; return 0;
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static struct i2c_driver driver = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.id = I2C_DRIVERID_TUNER, .name = "tuner",
.attach_adapter = tuner_probe, .driverid = I2C_DRIVERID_TUNER,
.detach_client = tuner_detach,
.command = tuner_command, .command = tuner_command,
.probe = tuner_probe,
.remove = tuner_remove,
.suspend = tuner_suspend, .suspend = tuner_suspend,
.resume = tuner_resume, .resume = tuner_resume,
.driver = { .legacy_probe = tuner_legacy_probe,
.name = "tuner",
},
};
static struct i2c_client client_template = {
.name = "(tuner unset)",
.driver = &driver,
}; };
static int __init tuner_init_module(void)
{
return i2c_add_driver(&driver);
}
static void __exit tuner_cleanup_module(void)
{
i2c_del_driver(&driver);
}
module_init(tuner_init_module);
module_exit(tuner_cleanup_module);
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
......
...@@ -72,15 +72,15 @@ struct tuner { ...@@ -72,15 +72,15 @@ struct tuner {
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
#define tuner_warn(fmt, arg...) do {\ #define tuner_warn(fmt, arg...) do {\
printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \ printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
#define tuner_info(fmt, arg...) do {\ #define tuner_info(fmt, arg...) do {\
printk(KERN_INFO PREFIX "%d-%04x: " fmt, \ printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
#define tuner_dbg(fmt, arg...) do {\ #define tuner_dbg(fmt, arg...) do {\
extern int tuner_debug; \ extern int tuner_debug; \
if (tuner_debug) \ if (tuner_debug) \
printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \ printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
#endif /* __TUNER_DRIVER_H__ */ #endif /* __TUNER_DRIVER_H__ */
......
...@@ -48,14 +48,14 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf, ...@@ -48,14 +48,14 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf,
#ifndef __TUNER_DRIVER_H__ #ifndef __TUNER_DRIVER_H__
#define tuner_warn(fmt, arg...) do {\ #define tuner_warn(fmt, arg...) do {\
printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \ printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
#define tuner_info(fmt, arg...) do {\ #define tuner_info(fmt, arg...) do {\
printk(KERN_INFO PREFIX "%d-%04x: " fmt, \ printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
#define tuner_dbg(fmt, arg...) do {\ #define tuner_dbg(fmt, arg...) do {\
if ((debug)) \ if ((debug)) \
printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \ printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
#endif /* __TUNER_DRIVER_H__ */ #endif /* __TUNER_DRIVER_H__ */
......
...@@ -17,7 +17,7 @@ static int debug = 0; ...@@ -17,7 +17,7 @@ static int debug = 0;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages"); MODULE_PARM_DESC(debug, "enable verbose debug messages");
#define PREFIX "tuner-simple " #define PREFIX "tuner-simple"
static int offset = 0; static int offset = 0;
module_param(offset, int, 0664); module_param(offset, int, 0664);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <linux/dvb/frontend.h> #include <linux/dvb/frontend.h>
#include "dvb_frontend.h" #include "dvb_frontend.h"
#define PREFIX "xc2028 " #define PREFIX "xc2028"
static LIST_HEAD(xc2028_list); static LIST_HEAD(xc2028_list);
/* struct for storing firmware table */ /* struct for storing firmware table */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment