Commit f26843fa authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] i2c update for tuner.c

This has some i2c adaptions and cleanups for the tv card tuner module.
parent 8af53d35
...@@ -18,17 +18,7 @@ ...@@ -18,17 +18,7 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = {I2C_CLIENT_END}; static unsigned short normal_i2c[] = {I2C_CLIENT_END};
static unsigned short normal_i2c_range[] = {0x60,0x6f,I2C_CLIENT_END}; static unsigned short normal_i2c_range[] = {0x60,0x6f,I2C_CLIENT_END};
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; I2C_CLIENT_INSMOD;
static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = {
normal_i2c, normal_i2c_range,
probe, probe_range,
ignore, ignore_range,
force
};
/* insmod options */ /* insmod options */
static int debug = 0; static int debug = 0;
...@@ -142,7 +132,7 @@ static struct tunertype tuners[] = { ...@@ -142,7 +132,7 @@ static struct tunertype tuners[] = {
16*140.25,16*463.25,0x02,0x04,0x01,0x8e,623}, 16*140.25,16*463.25,0x02,0x04,0x01,0x8e,623},
{ "Philips PAL_I (FI1246 and compatibles)", Philips, PAL_I, { "Philips PAL_I (FI1246 and compatibles)", Philips, PAL_I,
16*140.25,16*463.25,0xa0,0x90,0x30,0x8e,623}, 16*140.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
{ "Philips NTSC (FI1236 and compatibles)", Philips, NTSC, { "Philips NTSC (FI1236,FM1236 and compatibles)", Philips, NTSC,
16*157.25,16*451.25,0xA0,0x90,0x30,0x8e,732}, 16*157.25,16*451.25,0xA0,0x90,0x30,0x8e,732},
{ "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)", Philips, SECAM, { "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)", Philips, SECAM,
16*168.25,16*447.25,0xA7,0x97,0x37,0x8e,623}, 16*168.25,16*447.25,0xA7,0x97,0x37,0x8e,623},
...@@ -736,6 +726,7 @@ static void mt2032_set_radio_freq(struct i2c_client *c,int freq) ...@@ -736,6 +726,7 @@ static void mt2032_set_radio_freq(struct i2c_client *c,int freq)
if2=10700*1000; // 10.7MHz FM intermediate frequency if2=10700*1000; // 10.7MHz FM intermediate frequency
// per Manual for FM tuning: first if center freq. 1085 MHz
mt2032_set_if_freq(c,freq* 1000*1000/16, 1085*1000*1000,if2,if2,if2); mt2032_set_if_freq(c,freq* 1000*1000/16, 1085*1000*1000,if2,if2,if2);
} }
...@@ -811,6 +802,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, ...@@ -811,6 +802,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr,
memset(t,0,sizeof(struct tuner)); memset(t,0,sizeof(struct tuner));
if (type >= 0 && type < TUNERS) { if (type >= 0 && type < TUNERS) {
t->type = type; t->type = type;
printk("tuner(bttv): type forced to %d (%s) [insmod]\n",t->type,tuners[t->type].name);
strncpy(client->name, tuners[t->type].name, sizeof(client->name)); strncpy(client->name, tuners[t->type].name, sizeof(client->name));
} else { } else {
t->type = -1; t->type = -1;
...@@ -820,7 +812,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, ...@@ -820,7 +812,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr,
mt2032_init(client); mt2032_init(client);
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
return 0; return 0;
} }
...@@ -837,6 +828,7 @@ static int tuner_probe(struct i2c_adapter *adap) ...@@ -837,6 +828,7 @@ static int tuner_probe(struct i2c_adapter *adap)
case I2C_ALGO_BIT | I2C_HW_B_BT848: case I2C_ALGO_BIT | I2C_HW_B_BT848:
case I2C_ALGO_BIT | I2C_HW_B_RIVA: case I2C_ALGO_BIT | I2C_HW_B_RIVA:
case I2C_ALGO_SAA7134: case I2C_ALGO_SAA7134:
case I2C_ALGO_SAA7146:
printk("tuner: probing %s i2c adapter [id=0x%x]\n", printk("tuner: probing %s i2c adapter [id=0x%x]\n",
adap->name,adap->id); adap->name,adap->id);
rc = i2c_probe(adap, &addr_data, tuner_attach); rc = i2c_probe(adap, &addr_data, tuner_attach);
...@@ -875,7 +867,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -875,7 +867,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
/* --- configuration --- */ /* --- configuration --- */
case TUNER_SET_TYPE: case TUNER_SET_TYPE:
if (t->type != -1) { if (t->type != -1) {
printk("tuner: type already set\n"); printk("tuner: type already set (%d)\n",t->type);
return 0; return 0;
} }
if (*iarg < 0 || *iarg >= TUNERS) if (*iarg < 0 || *iarg >= TUNERS)
...@@ -975,7 +967,8 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -975,7 +967,8 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static struct i2c_driver driver = { static struct i2c_driver driver = {
.name = "i2cTVtunerdriver", .owner = THIS_MODULE,
.name = "i2c TV tuner driver",
.id = I2C_DRIVERID_TUNER, .id = I2C_DRIVERID_TUNER,
.flags = I2C_DF_NOTIFY, .flags = I2C_DF_NOTIFY,
.attach_adapter = tuner_probe, .attach_adapter = tuner_probe,
...@@ -984,7 +977,7 @@ static struct i2c_driver driver = { ...@@ -984,7 +977,7 @@ static struct i2c_driver driver = {
}; };
static struct i2c_client client_template = static struct i2c_client client_template =
{ {
.name = "(tunerunset)", .name = "(tuner unset)",
.flags = I2C_CLIENT_ALLOW_USE, .flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver, .driver = &driver,
}; };
......
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