Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 113807
b: refs/heads/master
c: a832781
h: refs/heads/master
i:
  113805: 5595969
  113803: bdc80a0
  113799: 3316ee0
  113791: 6eb1a0c
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent 5ce128b commit a0fe733
Show file tree
Hide file tree
Showing 5 changed files with 156 additions and 303 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7d341a6a52f115512d60b2de89b2ebde54da8eff
refs/heads/master: a832781cd383e70929c0ceece23f8a5b62e2152b
13 changes: 6 additions & 7 deletions trunk/drivers/media/video/mxb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,15 +466,15 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data
/* checking for i2c-devices can be omitted here, because we
already did this in "mxb_vl42_probe" */

saa7146_vv_init(dev,&vv_data);
if( 0 != saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
saa7146_vv_init(dev, &vv_data);
if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
ERR(("cannot register capture v4l2 device. skipping.\n"));
return -1;
}

/* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {
if( 0 != saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
if (MXB_BOARD_CAN_DO_VBI(dev)) {
if (saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
ERR(("cannot register vbi v4l2 device. skipping.\n"));
}
}
Expand All @@ -486,7 +486,7 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data
i2c_use_client(mxb->saa7111a);
i2c_use_client(mxb->tuner);

printk("mxb: found 'Multimedia eXtension Board'-%d.\n",mxb_num);
printk("mxb: found Multimedia eXtension Board #%d.\n", mxb_num);

mxb_num++;
mxb_init_done(dev);
Expand Down Expand Up @@ -737,16 +737,15 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
DEB_EE(("VIDIOC_G_TUNER: %d\n", t->index));

memset(t,0,sizeof(*t));
strcpy(t->name, "Television");

strlcpy(t->name, "Television", sizeof(t->name));
t->type = V4L2_TUNER_ANALOG_TV;
t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
t->rangelow = 772; /* 48.25 MHZ / 62.5 kHz = 772, see fi1216mk2-specs, page 2 */
t->rangehigh = 13684; /* 855.25 MHz / 62.5 kHz = 13684 */
/* FIXME: add the real signal strength here */
t->signal = 0xffff;
t->afc = 0;

mxb->tda9840->driver->command(mxb->tda9840,TDA9840_DETECT, &byte);
t->audmode = mxb->cur_mode;

Expand Down
166 changes: 58 additions & 108 deletions trunk/drivers/media/video/tda9840.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
tda9840 - i2c-driver for the tda9840 by SGS Thomson
Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
The tda9840 is a stereo/dual sound processor with digital
identification. It can be found at address 0x84 on the i2c-bus.
Expand All @@ -28,15 +29,18 @@
#include <linux/module.h>
#include <linux/ioctl.h>
#include <linux/i2c.h>

#include <media/v4l2-common.h>
#include <media/v4l2-i2c-drv-legacy.h>
#include "tda9840.h"

static int debug; /* insmod parameter */
MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
MODULE_DESCRIPTION("tda9840 driver");
MODULE_LICENSE("GPL");

static int debug;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");

#define dprintk(args...) \
do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
MODULE_PARM_DESC(debug, "Debug level (0-1)");

#define SWITCH 0x00
#define LEVEL_ADJUST 0x02
Expand All @@ -49,18 +53,21 @@ static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };
/* magic definition of all other variables and things */
I2C_CLIENT_INSMOD;

static struct i2c_driver driver;
static struct i2c_client client_template;
static void tda9840_write(struct i2c_client *client, u8 reg, u8 val)
{
if (i2c_smbus_write_byte_data(client, reg, val))
v4l_dbg(1, debug, client, "error writing %02x to %02x\n",
val, reg);
}

static int command(struct i2c_client *client, unsigned int cmd, void *arg)
static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
{
int result;
int byte = *(int *)arg;

switch (cmd) {
case TDA9840_SWITCH:

dprintk("TDA9840_SWITCH: 0x%02x\n", byte);
v4l_dbg(1, debug, client, "TDA9840_SWITCH: 0x%02x\n", byte);

if (byte != TDA9840_SET_MONO
&& byte != TDA9840_SET_MUTE
Expand All @@ -73,14 +80,11 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
return -EINVAL;
}

result = i2c_smbus_write_byte_data(client, SWITCH, byte);
if (result)
dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
tda9840_write(client, SWITCH, byte);
break;

case TDA9840_LEVEL_ADJUST:

dprintk("TDA9840_LEVEL_ADJUST: %d\n", byte);
v4l_dbg(1, debug, client, "TDA9840_LEVEL_ADJUST: %d\n", byte);

/* check for correct range */
if (byte > 25 || byte < -20)
Expand All @@ -92,15 +96,11 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
byte += 0x8;
else
byte = -byte;

result = i2c_smbus_write_byte_data(client, LEVEL_ADJUST, byte);
if (result)
dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
tda9840_write(client, LEVEL_ADJUST, byte);
break;

case TDA9840_STEREO_ADJUST:

dprintk("TDA9840_STEREO_ADJUST: %d\n", byte);
v4l_dbg(1, debug, client, "TDA9840_STEREO_ADJUST: %d\n", byte);

/* check for correct range */
if (byte > 25 || byte < -24)
Expand All @@ -113,39 +113,37 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
else
byte = -byte;

result = i2c_smbus_write_byte_data(client, STEREO_ADJUST, byte);
if (result)
dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
tda9840_write(client, STEREO_ADJUST, byte);
break;

case TDA9840_DETECT: {
int *ret = (int *)arg;

byte = i2c_smbus_read_byte_data(client, STEREO_ADJUST);
if (byte == -1) {
dprintk("i2c_smbus_read_byte_data() failed\n");
v4l_dbg(1, debug, client,
"i2c_smbus_read_byte_data() failed\n");
return -EIO;
}

if (0 != (byte & 0x80)) {
dprintk("TDA9840_DETECT: register contents invalid\n");
if (byte & 0x80) {
v4l_dbg(1, debug, client,
"TDA9840_DETECT: register contents invalid\n");
return -EINVAL;
}

dprintk("TDA9840_DETECT: byte: 0x%02x\n", byte);
*ret = ((byte & 0x60) >> 5);
v4l_dbg(1, debug, client, "TDA9840_DETECT: byte: 0x%02x\n", byte);
*ret = (byte & 0x60) >> 5;
result = 0;
break;
}
case TDA9840_TEST:
dprintk("TDA9840_TEST: 0x%02x\n", byte);
v4l_dbg(1, debug, client, "TDA9840_TEST: 0x%02x\n", byte);

/* mask out irrelevant bits */
byte &= 0x3;

result = i2c_smbus_write_byte_data(client, TEST, byte);
if (result)
dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
tda9840_write(client, TEST, byte);
break;
default:
return -ENOIOCTLCMD;
Expand All @@ -157,99 +155,51 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0;
}

static int detect(struct i2c_adapter *adapter, int address, int kind)
static int tda9840_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_client *client;
int result = 0;

int byte = 0x0;
int result;
int byte;

/* let's see whether this adapter can support what we need */
if (0 == i2c_check_functionality(adapter,
I2C_FUNC_SMBUS_READ_BYTE_DATA |
I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) {
if (!i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_READ_BYTE_DATA |
I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
return 0;
}

/* allocate memory for client structure */
client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (!client) {
printk("not enough kernel memory\n");
return -ENOMEM;
}

/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
client->addr = address;
client->adapter = adapter;

/* tell the i2c layer a new client has arrived */
if (0 != (result = i2c_attach_client(client))) {
kfree(client);
return result;
}
v4l_info(client, "chip found @ 0x%x (%s)\n",
client->addr << 1, client->adapter->name);

/* set initial values for level & stereo - adjustment, mode */
byte = 0;
result = command(client, TDA9840_LEVEL_ADJUST, &byte);
result += command(client, TDA9840_STEREO_ADJUST, &byte);
result = tda9840_command(client, TDA9840_LEVEL_ADJUST, &byte);
result += tda9840_command(client, TDA9840_STEREO_ADJUST, &byte);
byte = TDA9840_SET_MONO;
result = command(client, TDA9840_SWITCH, &byte);
result = tda9840_command(client, TDA9840_SWITCH, &byte);
if (result) {
dprintk("could not initialize tda9840\n");
v4l_dbg(1, debug, client, "could not initialize tda9840\n");
return -ENODEV;
}

printk("tda9840: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
return 0;
}

static int attach(struct i2c_adapter *adapter)
static int tda9840_legacy_probe(struct i2c_adapter *adapter)
{
/* let's see whether this is a know adapter we can attach to */
if (adapter->id != I2C_HW_SAA7146) {
dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
return -ENODEV;
}

return i2c_probe(adapter, &addr_data, &detect);
/* Let's see whether this is a known adapter we can attach to.
Prevents conflicts with tvaudio.c. */
return adapter->id == I2C_HW_SAA7146;
}

static int detach(struct i2c_client *client)
{
int ret = i2c_detach_client(client);
kfree(client);
return ret;
}

static struct i2c_driver driver = {
.driver = {
.name = "tda9840",
},
.id = I2C_DRIVERID_TDA9840,
.attach_adapter = attach,
.detach_client = detach,
.command = command,
static const struct i2c_device_id tda9840_id[] = {
{ "tda9840", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, tda9840_id);

static struct i2c_client client_template = {
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tda9840",
.driver = &driver,
.driverid = I2C_DRIVERID_TDA9840,
.command = tda9840_command,
.probe = tda9840_probe,
.legacy_probe = tda9840_legacy_probe,
.id_table = tda9840_id,
};

static int __init this_module_init(void)
{
return i2c_add_driver(&driver);
}

static void __exit this_module_exit(void)
{
i2c_del_driver(&driver);
}

module_init(this_module_init);
module_exit(this_module_exit);

MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
MODULE_DESCRIPTION("tda9840 driver");
MODULE_LICENSE("GPL");
Loading

0 comments on commit a0fe733

Please sign in to comment.