X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fcx88%2Fcx88-i2c.c;h=36b0dbb494551661f12a5fe41b16c32ff1180b86;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=a04aad36ccecf2cdce35875d07a98ead3045a7c0;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c index a04aad36c..36b0dbb49 100644 --- a/drivers/media/video/cx88/cx88-i2c.c +++ b/drivers/media/video/cx88/cx88-i2c.c @@ -1,4 +1,6 @@ /* + $Id: cx88-i2c.c,v 1.18 2004/10/13 10:39:00 kraxel Exp $ + cx88-i2c.c -- all the i2c code is here Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de) @@ -19,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ #include @@ -29,44 +31,55 @@ #include "cx88.h" +static unsigned int i2c_debug = 0; +module_param(i2c_debug, int, 0644); +MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); + +static unsigned int i2c_scan = 0; +module_param(i2c_scan, int, 0444); +MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); + +#define dprintk(level,fmt, arg...) if (i2c_debug >= level) \ + printk(KERN_DEBUG "%s: " fmt, core->name , ## arg) + /* ----------------------------------------------------------------------- */ void cx8800_bit_setscl(void *data, int state) { - struct cx8800_dev *dev = data; + struct cx88_core *core = data; if (state) - dev->i2c_state |= 0x02; + core->i2c_state |= 0x02; else - dev->i2c_state &= ~0x02; - cx_write(MO_I2C, dev->i2c_state); + core->i2c_state &= ~0x02; + cx_write(MO_I2C, core->i2c_state); cx_read(MO_I2C); } void cx8800_bit_setsda(void *data, int state) { - struct cx8800_dev *dev = data; + struct cx88_core *core = data; if (state) - dev->i2c_state |= 0x01; + core->i2c_state |= 0x01; else - dev->i2c_state &= ~0x01; - cx_write(MO_I2C, dev->i2c_state); + core->i2c_state &= ~0x01; + cx_write(MO_I2C, core->i2c_state); cx_read(MO_I2C); } static int cx8800_bit_getscl(void *data) { - struct cx8800_dev *dev = data; + struct cx88_core *core = data; u32 state; - + state = cx_read(MO_I2C); return state & 0x02 ? 1 : 0; } static int cx8800_bit_getsda(void *data) { - struct cx8800_dev *dev = data; + struct cx88_core *core = data; u32 state; state = cx_read(MO_I2C); @@ -75,36 +88,35 @@ static int cx8800_bit_getsda(void *data) /* ----------------------------------------------------------------------- */ -#ifndef I2C_PEC -static void cx8800_inc_use(struct i2c_adapter *adap) -{ - MOD_INC_USE_COUNT; -} - -static void cx8800_dec_use(struct i2c_adapter *adap) +static int attach_inform(struct i2c_client *client) { - MOD_DEC_USE_COUNT; + struct cx88_core *core = i2c_get_adapdata(client->adapter); + + dprintk(1, "i2c attach [addr=0x%x,client=%s]\n", + client->addr, i2c_clientname(client)); + if (!client->driver->command) + return 0; + + if (core->tuner_type != UNSET) + client->driver->command(client, TUNER_SET_TYPE, &core->tuner_type); + if (core->tda9887_conf) + client->driver->command(client, TDA9887_SET_CONFIG, &core->tda9887_conf); + return 0; } -#endif -static int attach_inform(struct i2c_client *client) +static int detach_inform(struct i2c_client *client) { - struct cx8800_dev *dev = i2c_get_adapdata(client->adapter); + struct cx88_core *core = i2c_get_adapdata(client->adapter); - if (dev->tuner_type != UNSET) - cx8800_call_i2c_clients(dev,TUNER_SET_TYPE,&dev->tuner_type); - - if (1 /* fixme: debug */) - printk("%s: i2c attach [client=%s]\n", - dev->name, i2c_clientname(client)); - return 0; + dprintk(1, "i2c detach [client=%s]\n", i2c_clientname(client)); + return 0; } -void cx8800_call_i2c_clients(struct cx8800_dev *dev, unsigned int cmd, void *arg) +void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) { - if (0 != dev->i2c_rc) + if (0 != core->i2c_rc) return; - i2c_clients_command(&dev->i2c_adap, cmd, arg); + i2c_clients_command(&core->i2c_adap, cmd, arg); } static struct i2c_algo_bit_data cx8800_i2c_algo_template = { @@ -120,18 +132,11 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = { /* ----------------------------------------------------------------------- */ static struct i2c_adapter cx8800_i2c_adap_template = { -#ifdef I2C_PEC - .owner = THIS_MODULE, -#else - .inc_use = cx8800_inc_use, - .dec_use = cx8800_dec_use, -#endif -#ifdef I2C_CLASS_TV_ANALOG - .class = I2C_CLASS_TV_ANALOG, -#endif I2C_DEVNAME("cx2388x"), - .id = I2C_HW_B_BT848, + .owner = THIS_MODULE, + .id = I2C_HW_B_CX2388x, .client_register = attach_inform, + .client_unregister = detach_inform, }; static struct i2c_client cx8800_i2c_client_template = { @@ -139,32 +144,68 @@ static struct i2c_client cx8800_i2c_client_template = { .id = -1, }; +static char *i2c_devs[128] = { + [ 0x86 >> 1 ] = "tda9887/cx22702", + [ 0xa0 >> 1 ] = "eeprom", + [ 0xc0 >> 1 ] = "tuner (analog)", + [ 0xc2 >> 1 ] = "tuner (analog/dvb)", +}; + +static void do_i2c_scan(char *name, struct i2c_client *c) +{ + unsigned char buf; + int i,rc; + + for (i = 0; i < 128; i++) { + c->addr = i; + rc = i2c_master_recv(c,&buf,0); + if (rc < 0) + continue; + printk("%s: i2c scan: found device @ 0x%x [%s]\n", + name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???"); + } +} + /* init + register i2c algo-bit adapter */ -int __devinit cx8800_i2c_init(struct cx8800_dev *dev) +int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci) { - memcpy(&dev->i2c_adap, &cx8800_i2c_adap_template, - sizeof(dev->i2c_adap)); - memcpy(&dev->i2c_algo, &cx8800_i2c_algo_template, - sizeof(dev->i2c_algo)); - memcpy(&dev->i2c_client, &cx8800_i2c_client_template, - sizeof(dev->i2c_client)); - - dev->i2c_adap.dev.parent = &dev->pci->dev; - strlcpy(dev->i2c_adap.name,dev->name,sizeof(dev->i2c_adap.name)); - dev->i2c_algo.data = dev; - i2c_set_adapdata(&dev->i2c_adap,dev); - dev->i2c_adap.algo_data = &dev->i2c_algo; - dev->i2c_client.adapter = &dev->i2c_adap; - - cx8800_bit_setscl(dev,1); - cx8800_bit_setsda(dev,1); - - dev->i2c_rc = i2c_bit_add_bus(&dev->i2c_adap); - printk("%s: i2c register %s\n", dev->name, - (0 == dev->i2c_rc) ? "ok" : "FAILED"); - return dev->i2c_rc; + memcpy(&core->i2c_adap, &cx8800_i2c_adap_template, + sizeof(core->i2c_adap)); + memcpy(&core->i2c_algo, &cx8800_i2c_algo_template, + sizeof(core->i2c_algo)); + memcpy(&core->i2c_client, &cx8800_i2c_client_template, + sizeof(core->i2c_client)); + + if (core->tuner_type != TUNER_ABSENT) + core->i2c_adap.class |= I2C_CLASS_TV_ANALOG; + if (cx88_boards[core->board].dvb) + core->i2c_adap.class |= I2C_CLASS_TV_DIGITAL; + + core->i2c_adap.dev.parent = &pci->dev; + strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name)); + core->i2c_algo.data = core; + i2c_set_adapdata(&core->i2c_adap,core); + core->i2c_adap.algo_data = &core->i2c_algo; + core->i2c_client.adapter = &core->i2c_adap; + + cx8800_bit_setscl(core,1); + cx8800_bit_setsda(core,1); + + core->i2c_rc = i2c_bit_add_bus(&core->i2c_adap); + if (0 == core->i2c_rc) { + dprintk(1, "i2c register ok\n"); + if (i2c_scan) + do_i2c_scan(core->name,&core->i2c_client); + } else + printk("%s: i2c register FAILED\n", core->name); + return core->i2c_rc; } +/* ----------------------------------------------------------------------- */ + +EXPORT_SYMBOL(cx88_call_i2c_clients); +EXPORT_SYMBOL(cx88_i2c_init); + /* * Local variables: * c-basic-offset: 8