Commit 6394cf53 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab

V4L/DVB (7469): Preparation for supporting new devices, cleanup and saneness

To prepare the support for new device to the flexcop-family some preparation and cleanups was done + some saneness:

- created an i2c-adapter for each i2c-port available. Easier usage for devices with several device on different i2c-busses
- initialize i2c before doing the eeprom read
- changed the way to attach the different frontends, easier to read now
- enabled support for i2c-devices having no register address (1-byte access)
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0b5afdd2
...@@ -44,6 +44,14 @@ struct flexcop_dma { ...@@ -44,6 +44,14 @@ struct flexcop_dma {
u32 size; /* size of each address in bytes */ u32 size; /* size of each address in bytes */
}; };
struct flexcop_i2c_adapter {
struct flexcop_device *fc;
struct i2c_adapter i2c_adap;
u8 no_base_addr;
flexcop_i2c_port_t port;
};
/* Control structure for data definitions that are common to /* Control structure for data definitions that are common to
* the B2C2-based PCI and USB devices. * the B2C2-based PCI and USB devices.
*/ */
...@@ -72,7 +80,7 @@ struct flexcop_device { ...@@ -72,7 +80,7 @@ struct flexcop_device {
struct dmx_frontend mem_frontend; struct dmx_frontend mem_frontend;
int (*fe_sleep) (struct dvb_frontend *); int (*fe_sleep) (struct dvb_frontend *);
struct i2c_adapter i2c_adap; struct flexcop_i2c_adapter fc_i2c_adap[3];
struct mutex i2c_mutex; struct mutex i2c_mutex;
struct module *owner; struct module *owner;
...@@ -87,7 +95,8 @@ struct flexcop_device { ...@@ -87,7 +95,8 @@ struct flexcop_device {
int (*write_ibi_reg) (struct flexcop_device *, flexcop_ibi_register, flexcop_ibi_value); int (*write_ibi_reg) (struct flexcop_device *, flexcop_ibi_register, flexcop_ibi_value);
int (*i2c_request) (struct flexcop_device*, flexcop_access_op_t, flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len); int (*i2c_request) (struct flexcop_i2c_adapter*,
flexcop_access_op_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
int (*stream_control) (struct flexcop_device*, int); int (*stream_control) (struct flexcop_device*, int);
int (*get_mac_addr) (struct flexcop_device *fc, int extended); int (*get_mac_addr) (struct flexcop_device *fc, int extended);
...@@ -128,8 +137,8 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended); ...@@ -128,8 +137,8 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended);
* one. We have it in flexcop-i2c.c, because it is going via the actual * one. We have it in flexcop-i2c.c, because it is going via the actual
* I2C-channel of the flexcop. * I2C-channel of the flexcop.
*/ */
int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t, int flexcop_i2c_request(struct flexcop_i2c_adapter*, flexcop_access_op_t,
flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len); u8 chipaddr, u8 addr, u8 *buf, u16 len);
/* from flexcop-sram.c */ /* from flexcop-sram.c */
int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target); int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target);
......
...@@ -114,15 +114,18 @@ static int flexcop_eeprom_request(struct flexcop_device *fc, flexcop_access_op_t ...@@ -114,15 +114,18 @@ static int flexcop_eeprom_request(struct flexcop_device *fc, flexcop_access_op_t
{ {
int i,ret = 0; int i,ret = 0;
u8 chipaddr = 0x50 | ((addr >> 8) & 3); u8 chipaddr = 0x50 | ((addr >> 8) & 3);
for (i = 0; i < retries; i++) for (i = 0; i < retries; i++) {
if ((ret = fc->i2c_request(fc,op,FC_I2C_PORT_EEPROM,chipaddr,addr & 0xff,buf,len)) == 0) ret = fc->i2c_request(&fc->fc_i2c_adap[1], op, chipaddr,
addr & 0xff, buf, len);
if (ret == 0)
break; break;
}
return ret; return ret;
} }
static int flexcop_eeprom_lrc_read(struct flexcop_device *fc, u16 addr, u8 *buf, u16 len, int retries) static int flexcop_eeprom_lrc_read(struct flexcop_device *fc, u16 addr, u8 *buf, u16 len, int retries)
{ {
int ret = flexcop_eeprom_request(fc,FC_READ,addr,buf,len,retries); int ret = flexcop_eeprom_request(fc, FC_READ, addr, buf, len, retries);
if (ret == 0) if (ret == 0)
if (calc_lrc(buf, len - 1) != buf[len - 1]) if (calc_lrc(buf, len - 1) != buf[len - 1])
ret = -EINVAL; ret = -EINVAL;
......
...@@ -183,13 +183,13 @@ static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dv ...@@ -183,13 +183,13 @@ static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dv
buf[2] = 0x84; /* 0xC4 */ buf[2] = 0x84; /* 0xC4 */
buf[3] = 0x08; buf[3] = 0x08;
if (params->frequency < 1500000) buf[3] |= 0x10; if (params->frequency < 1500000)
buf[3] |= 0x10;
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1) { if (i2c_transfer(&fc->fc_i2c_adap[0].i2c_adap, &msg, 1) != 1)
return -EIO; return -EIO;
}
return 0; return 0;
} }
...@@ -340,7 +340,7 @@ static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe, ...@@ -340,7 +340,7 @@ static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe,
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1) if (i2c_transfer(&fc->fc_i2c_adap[0].i2c_adap, &msg, 1) != 1)
return -EIO; return -EIO;
return 0; return 0;
} }
...@@ -389,10 +389,11 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe, ...@@ -389,10 +389,11 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]); deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]);
ret = fc->i2c_request(fc, FC_WRITE, FC_I2C_PORT_TUNER, 0x61, buf[0], &buf[1], 3); ret = fc->i2c_request(&fc->fc_i2c_adap[2],
FC_WRITE, 0x61, buf[0], &buf[1], 3);
deb_tuner("tuner write returned: %d\n",ret); deb_tuner("tuner write returned: %d\n",ret);
return 0; return ret;
} }
static u8 alps_tdee4_stv0297_inittab[] = { static u8 alps_tdee4_stv0297_inittab[] = {
...@@ -479,53 +480,67 @@ static struct stv0297_config alps_tdee4_stv0297_config = { ...@@ -479,53 +480,67 @@ static struct stv0297_config alps_tdee4_stv0297_config = {
int flexcop_frontend_init(struct flexcop_device *fc) int flexcop_frontend_init(struct flexcop_device *fc)
{ {
struct dvb_frontend_ops *ops; struct dvb_frontend_ops *ops;
struct i2c_adapter *i2c = &fc->fc_i2c_adap[0].i2c_adap;
/* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */ /* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
if ((fc->fe = dvb_attach(stv0299_attach, &samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) { fc->fe = dvb_attach(stv0299_attach, &samsung_tbmu24112_config, i2c);
if (fc->fe != NULL) {
ops = &fc->fe->ops; ops = &fc->fe->ops;
ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params; ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;
ops->set_voltage = flexcop_set_voltage; ops->set_voltage = flexcop_set_voltage;
fc->fe_sleep = ops->sleep; fc->fe_sleep = ops->sleep;
ops->sleep = flexcop_sleep; ops->sleep = flexcop_sleep;
fc->dev_type = FC_SKY;
goto fe_found;
}
fc->dev_type = FC_SKY;
info("found the stv0299 at i2c address: 0x%02x",samsung_tbmu24112_config.demod_address);
} else
/* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */ /* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */
if ((fc->fe = dvb_attach(mt352_attach, &samsung_tdtc9251dh0_config, &fc->i2c_adap)) != NULL ) { fc->fe = dvb_attach(mt352_attach, &samsung_tdtc9251dh0_config, i2c);
fc->dev_type = FC_AIR_DVB; if (fc->fe != NULL) {
fc->dev_type = FC_AIR_DVB;
fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs; fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address); goto fe_found;
} else }
/* try the air atsc 2nd generation (nxt2002) */ /* try the air atsc 2nd generation (nxt2002) */
if ((fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, &fc->i2c_adap)) != NULL) { fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, i2c);
fc->dev_type = FC_AIR_ATSC2; if (fc->fe != NULL) {
fc->dev_type = FC_AIR_ATSC2;
dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, DVB_PLL_SAMSUNG_TBMV); dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, DVB_PLL_SAMSUNG_TBMV);
info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address); goto fe_found;
} else }
/* try the air atsc 3nd generation (lgdt3303) */
if ((fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) { fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, i2c);
fc->dev_type = FC_AIR_ATSC3; if (fc->fe != NULL) {
dvb_attach(simple_tuner_attach, fc->fe, fc->dev_type = FC_AIR_ATSC3;
&fc->i2c_adap, 0x61, TUNER_LG_TDVS_H06XF); dvb_attach(simple_tuner_attach, fc->fe, i2c, 0x61,
info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address); TUNER_LG_TDVS_H06XF);
} else goto fe_found;
}
/* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */ /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
if ((fc->fe = dvb_attach(bcm3510_attach, &air2pc_atsc_first_gen_config, &fc->i2c_adap)) != NULL) { fc->fe = dvb_attach(bcm3510_attach, &air2pc_atsc_first_gen_config, i2c);
fc->dev_type = FC_AIR_ATSC1; if (fc->fe != NULL) {
info("found the bcm3510 at i2c address: 0x%02x",air2pc_atsc_first_gen_config.demod_address); fc->dev_type = FC_AIR_ATSC1;
} else goto fe_found;
}
/* try the cable dvb (stv0297) */ /* try the cable dvb (stv0297) */
if ((fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) { fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, i2c);
fc->dev_type = FC_CABLE; if (fc->fe != NULL) {
fc->dev_type = FC_CABLE;
fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params; fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address); goto fe_found;
} else }
/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
if ((fc->fe = dvb_attach(vp310_mt312_attach, &skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) { fc->fe = dvb_attach(vp310_mt312_attach,
&skystar23_samsung_tbdu18132_config, i2c);
if (fc->fe != NULL) {
ops = &fc->fe->ops; ops = &fc->fe->ops;
ops->tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params; ops->tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params;
...@@ -539,19 +554,21 @@ int flexcop_frontend_init(struct flexcop_device *fc) ...@@ -539,19 +554,21 @@ int flexcop_frontend_init(struct flexcop_device *fc)
ops->sleep = flexcop_sleep; ops->sleep = flexcop_sleep;
fc->dev_type = FC_SKY_OLD; fc->dev_type = FC_SKY_OLD;
info("found the vp310 (aka mt312) at i2c address: 0x%02x",skystar23_samsung_tbdu18132_config.demod_address); goto fe_found;
} }
if (fc->fe == NULL) { err("no frontend driver found for this B2C2/FlexCop adapter");
err("no frontend driver found for this B2C2/FlexCop adapter"); return -ENODEV;
return -ENODEV;
} else { fe_found:
if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) { info("found '%s' .", fc->fe->ops.info.name);
err("frontend registration failed!"); if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
dvb_frontend_detach(fc->fe); err("frontend registration failed!");
fc->fe = NULL; ops = &fc->fe->ops;
return -EINVAL; if (ops->release != NULL)
} ops->release(fc->fe);
fc->fe = NULL;
return -EINVAL;
} }
fc->init_state |= FC_STATE_FE_INIT; fc->init_state |= FC_STATE_FE_INIT;
return 0; return 0;
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#define FC_MAX_I2C_RETRIES 100000 #define FC_MAX_I2C_RETRIES 100000
/* #define DUMP_I2C_MESSAGES */
static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value *r100) static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value *r100)
{ {
int i; int i;
...@@ -38,30 +40,25 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value *r ...@@ -38,30 +40,25 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value *r
return -EREMOTEIO; return -EREMOTEIO;
} }
static int flexcop_i2c_read4(struct flexcop_device *fc, flexcop_ibi_value r100, u8 *buf) static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c,
flexcop_ibi_value r100, u8 *buf)
{ {
flexcop_ibi_value r104; flexcop_ibi_value r104;
int len = r100.tw_sm_c_100.total_bytes, /* remember total_bytes is buflen-1 */ int len = r100.tw_sm_c_100.total_bytes, /* remember total_bytes is buflen-1 */
ret; ret;
if ((ret = flexcop_i2c_operation(fc,&r100)) != 0) { r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr;
/* The Cablestar needs a different kind of i2c-transfer (does not ret = flexcop_i2c_operation(i2c->fc, &r100);
* support "Repeat Start"): if (ret != 0) {
* wait for the ACK failure, deb_i2c("read failed. %d\n", ret);
* and do a subsequent read with the Bit 30 enabled return ret;
*/
r100.tw_sm_c_100.no_base_addr_ack_error = 1;
if ((ret = flexcop_i2c_operation(fc,&r100)) != 0) {
deb_i2c("no_base_addr read failed. %d\n",ret);
return ret;
}
} }
buf[0] = r100.tw_sm_c_100.data1_reg; buf[0] = r100.tw_sm_c_100.data1_reg;
if (len > 0) { if (len > 0) {
r104 = fc->read_ibi_reg(fc,tw_sm_c_104); r104 = i2c->fc->read_ibi_reg(i2c->fc, tw_sm_c_104);
deb_i2c("read: r100: %08x, r104: %08x\n",r100.raw,r104.raw); deb_i2c("read: r100: %08x, r104: %08x\n", r100.raw, r104.raw);
/* there is at least one more byte, otherwise we wouldn't be here */ /* there is at least one more byte, otherwise we wouldn't be here */
buf[1] = r104.tw_sm_c_104.data2_reg; buf[1] = r104.tw_sm_c_104.data2_reg;
...@@ -85,17 +82,22 @@ static int flexcop_i2c_write4(struct flexcop_device *fc, flexcop_ibi_value r100, ...@@ -85,17 +82,22 @@ static int flexcop_i2c_write4(struct flexcop_device *fc, flexcop_ibi_value r100,
r104.tw_sm_c_104.data3_reg = len > 1 ? buf[2] : 0; r104.tw_sm_c_104.data3_reg = len > 1 ? buf[2] : 0;
r104.tw_sm_c_104.data4_reg = len > 2 ? buf[3] : 0; r104.tw_sm_c_104.data4_reg = len > 2 ? buf[3] : 0;
deb_i2c("write: r100: %08x, r104: %08x\n",r100.raw,r104.raw); deb_i2c("write: r100: %08x, r104: %08x\n", r100.raw, r104.raw);
/* write the additional i2c data before doing the actual i2c operation */ /* write the additional i2c data before doing the actual i2c operation */
fc->write_ibi_reg(fc,tw_sm_c_104,r104); fc->write_ibi_reg(fc, tw_sm_c_104, r104);
return flexcop_i2c_operation(fc,&r100); return flexcop_i2c_operation(fc, &r100);
} }
int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op, int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c,
flexcop_i2c_port_t port, u8 chipaddr, u8 addr, u8 *buf, u16 len) flexcop_access_op_t op, u8 chipaddr, u8 addr, u8 *buf, u16 len)
{ {
int ret; int ret;
#ifdef DUMP_I2C_MESSAGES
int i;
#endif
u16 bytes_to_transfer; u16 bytes_to_transfer;
flexcop_ibi_value r100; flexcop_ibi_value r100;
...@@ -103,7 +105,25 @@ int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op, ...@@ -103,7 +105,25 @@ int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op,
r100.raw = 0; r100.raw = 0;
r100.tw_sm_c_100.chipaddr = chipaddr; r100.tw_sm_c_100.chipaddr = chipaddr;
r100.tw_sm_c_100.twoWS_rw = op; r100.tw_sm_c_100.twoWS_rw = op;
r100.tw_sm_c_100.twoWS_port_reg = port; r100.tw_sm_c_100.twoWS_port_reg = i2c->port;
#ifdef DUMP_I2C_MESSAGES
printk(KERN_DEBUG "%d ", i2c->port);
if (op == FC_READ)
printk("rd(");
else
printk("wr(");
printk("%02x): %02x ", chipaddr, addr);
#endif
/* in that case addr is the only value ->
* we write it twice as baseaddr and val0
* BBTI is doing it like that for ISL6421 at least */
if (i2c->no_base_addr && len == 0 && op == FC_WRITE) {
buf = &addr;
len = 1;
}
while (len != 0) { while (len != 0) {
bytes_to_transfer = len > 4 ? 4 : len; bytes_to_transfer = len > 4 ? 4 : len;
...@@ -112,9 +132,14 @@ int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op, ...@@ -112,9 +132,14 @@ int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op,
r100.tw_sm_c_100.baseaddr = addr; r100.tw_sm_c_100.baseaddr = addr;
if (op == FC_READ) if (op == FC_READ)
ret = flexcop_i2c_read4(fc, r100, buf); ret = flexcop_i2c_read4(i2c, r100, buf);
else else
ret = flexcop_i2c_write4(fc,r100, buf); ret = flexcop_i2c_write4(i2c->fc, r100, buf);
#ifdef DUMP_I2C_MESSAGES
for (i = 0; i < bytes_to_transfer; i++)
printk("%02x ", buf[i]);
#endif
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -122,7 +147,11 @@ int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op, ...@@ -122,7 +147,11 @@ int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op,
buf += bytes_to_transfer; buf += bytes_to_transfer;
addr += bytes_to_transfer; addr += bytes_to_transfer;
len -= bytes_to_transfer; len -= bytes_to_transfer;
}; }
#ifdef DUMP_I2C_MESSAGES
printk("\n");
#endif
return 0; return 0;
} }
...@@ -132,7 +161,7 @@ EXPORT_SYMBOL(flexcop_i2c_request); ...@@ -132,7 +161,7 @@ EXPORT_SYMBOL(flexcop_i2c_request);
/* master xfer callback for demodulator */ /* master xfer callback for demodulator */
static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
{ {
struct flexcop_device *fc = i2c_get_adapdata(i2c_adap); struct flexcop_i2c_adapter *i2c = i2c_get_adapdata(i2c_adap);
int i, ret = 0; int i, ret = 0;
/* Some drivers use 1 byte or 0 byte reads as probes, which this /* Some drivers use 1 byte or 0 byte reads as probes, which this
...@@ -142,34 +171,29 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs ...@@ -142,34 +171,29 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs
if (num == 1 && msgs[0].flags == I2C_M_RD && msgs[0].len <= 1) if (num == 1 && msgs[0].flags == I2C_M_RD && msgs[0].len <= 1)
return 1; return 1;
if (mutex_lock_interruptible(&fc->i2c_mutex)) if (mutex_lock_interruptible(&i2c->fc->i2c_mutex))
return -ERESTARTSYS; return -ERESTARTSYS;
/* reading */ for (i = 0; i < num; i++) {
if (num == 2 && /* reading */
msgs[0].flags == 0 && if (i+1 < num && (msgs[i+1].flags == I2C_M_RD)) {
msgs[1].flags == I2C_M_RD && ret = i2c->fc->i2c_request(i2c, FC_READ, msgs[i].addr,
msgs[0].buf != NULL && msgs[i].buf[0], msgs[i+1].buf, msgs[i+1].len);
msgs[1].buf != NULL) { i++; /* skip the following message */
} else /* writing */
ret = fc->i2c_request(fc, FC_READ, FC_I2C_PORT_DEMOD, msgs[0].addr, msgs[0].buf[0], msgs[1].buf, msgs[1].len); ret = i2c->fc->i2c_request(i2c, FC_WRITE, msgs[i].addr,
msgs[i].buf[0], &msgs[i].buf[1],
} else for (i = 0; i < num; i++) { /* writing command */ msgs[i].len - 1);
if (msgs[i].flags != 0 || msgs[i].buf == NULL || msgs[i].len < 2) { if (ret < 0) {
ret = -EINVAL; err("i2c master_xfer failed");
break; break;
} }
ret = fc->i2c_request(fc, FC_WRITE, FC_I2C_PORT_DEMOD, msgs[i].addr, msgs[i].buf[0], &msgs[i].buf[1], msgs[i].len - 1);
} }
if (ret < 0) mutex_unlock(&i2c->fc->i2c_mutex);
err("i2c master_xfer failed");
else
ret = num;
mutex_unlock(&fc->i2c_mutex);
if (ret == 0)
ret = num;
return ret; return ret;
} }
...@@ -189,28 +213,68 @@ int flexcop_i2c_init(struct flexcop_device *fc) ...@@ -189,28 +213,68 @@ int flexcop_i2c_init(struct flexcop_device *fc)
mutex_init(&fc->i2c_mutex); mutex_init(&fc->i2c_mutex);
memset(&fc->i2c_adap, 0, sizeof(struct i2c_adapter)); fc->fc_i2c_adap[0].fc = fc;
strncpy(fc->i2c_adap.name, "B2C2 FlexCop device", fc->fc_i2c_adap[1].fc = fc;
sizeof(fc->i2c_adap.name)); fc->fc_i2c_adap[2].fc = fc;
i2c_set_adapdata(&fc->i2c_adap,fc); fc->fc_i2c_adap[0].port = FC_I2C_PORT_DEMOD;
fc->fc_i2c_adap[1].port = FC_I2C_PORT_EEPROM;
fc->fc_i2c_adap[2].port = FC_I2C_PORT_TUNER;
strncpy(fc->fc_i2c_adap[0].i2c_adap.name,
"B2C2 FlexCop I2C to demod", I2C_NAME_SIZE);
strncpy(fc->fc_i2c_adap[1].i2c_adap.name,
"B2C2 FlexCop I2C to eeprom", I2C_NAME_SIZE);
strncpy(fc->fc_i2c_adap[2].i2c_adap.name,
"B2C2 FlexCop I2C to tuner", I2C_NAME_SIZE);
i2c_set_adapdata(&fc->fc_i2c_adap[0].i2c_adap, &fc->fc_i2c_adap[0]);
i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]);
i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]);
fc->fc_i2c_adap[0].i2c_adap.class =
fc->fc_i2c_adap[1].i2c_adap.class =
fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL;
fc->fc_i2c_adap[0].i2c_adap.algo =
fc->fc_i2c_adap[1].i2c_adap.algo =
fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo;
fc->fc_i2c_adap[0].i2c_adap.algo_data =
fc->fc_i2c_adap[1].i2c_adap.algo_data =
fc->fc_i2c_adap[2].i2c_adap.algo_data = NULL;
fc->fc_i2c_adap[0].i2c_adap.dev.parent =
fc->fc_i2c_adap[1].i2c_adap.dev.parent =
fc->fc_i2c_adap[2].i2c_adap.dev.parent = fc->dev;
ret = i2c_add_adapter(&fc->fc_i2c_adap[0].i2c_adap);
if (ret < 0)
return ret;
fc->i2c_adap.class = I2C_CLASS_TV_DIGITAL; ret = i2c_add_adapter(&fc->fc_i2c_adap[1].i2c_adap);
fc->i2c_adap.algo = &flexcop_algo; if (ret < 0)
fc->i2c_adap.algo_data = NULL; goto adap_1_failed;
fc->i2c_adap.dev.parent = fc->dev;
if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0) ret = i2c_add_adapter(&fc->fc_i2c_adap[2].i2c_adap);
return ret; if (ret < 0)
goto adap_2_failed;
fc->init_state |= FC_STATE_I2C_INIT; fc->init_state |= FC_STATE_I2C_INIT;
return 0; return 0;
adap_2_failed:
i2c_del_adapter(&fc->fc_i2c_adap[1].i2c_adap);
adap_1_failed:
i2c_del_adapter(&fc->fc_i2c_adap[0].i2c_adap);
return ret;
} }
void flexcop_i2c_exit(struct flexcop_device *fc) void flexcop_i2c_exit(struct flexcop_device *fc)
{ {
if (fc->init_state & FC_STATE_I2C_INIT) if (fc->init_state & FC_STATE_I2C_INIT) {
i2c_del_adapter(&fc->i2c_adap); i2c_del_adapter(&fc->fc_i2c_adap[2].i2c_adap);
i2c_del_adapter(&fc->fc_i2c_adap[1].i2c_adap);
i2c_del_adapter(&fc->fc_i2c_adap[0].i2c_adap);
}
fc->init_state &= ~FC_STATE_I2C_INIT; fc->init_state &= ~FC_STATE_I2C_INIT;
} }
...@@ -211,10 +211,11 @@ static int flexcop_usb_utility_req(struct flexcop_usb *fc_usb, int set, ...@@ -211,10 +211,11 @@ static int flexcop_usb_utility_req(struct flexcop_usb *fc_usb, int set,
#endif #endif
/* usb i2c stuff */ /* usb i2c stuff */
static int flexcop_usb_i2c_req(struct flexcop_usb *fc_usb, static int flexcop_usb_i2c_req(struct flexcop_i2c_adapter *i2c,
flexcop_usb_request_t req, flexcop_usb_i2c_function_t func, flexcop_usb_request_t req, flexcop_usb_i2c_function_t func,
flexcop_i2c_port_t port, u8 chipaddr, u8 addr, u8 *buf, u8 buflen) u8 chipaddr, u8 addr, u8 *buf, u8 buflen)
{ {
struct flexcop_usb *fc_usb = i2c->fc->bus_specific;
u16 wValue, wIndex; u16 wValue, wIndex;
int nWaitTime,pipe,len; int nWaitTime,pipe,len;
// u8 dwRequestType; // u8 dwRequestType;
...@@ -242,7 +243,7 @@ static int flexcop_usb_i2c_req(struct flexcop_usb *fc_usb, ...@@ -242,7 +243,7 @@ static int flexcop_usb_i2c_req(struct flexcop_usb *fc_usb,
deb_info("unsupported function for i2c_req %x\n",func); deb_info("unsupported function for i2c_req %x\n",func);
return -EINVAL; return -EINVAL;
} }
wValue = (func << 8 ) | (port << 4); wValue = (func << 8) | (i2c->port << 4);
wIndex = (chipaddr << 8 ) | addr; wIndex = (chipaddr << 8 ) | addr;
deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n",func,request_type,req, deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n",func,request_type,req,
...@@ -274,13 +275,15 @@ static int flexcop_usb_write_ibi_reg(struct flexcop_device *fc, flexcop_ibi_regi ...@@ -274,13 +275,15 @@ static int flexcop_usb_write_ibi_reg(struct flexcop_device *fc, flexcop_ibi_regi
return flexcop_usb_readwrite_dw(fc,reg, &val.raw, 0); return flexcop_usb_readwrite_dw(fc,reg, &val.raw, 0);
} }
static int flexcop_usb_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op, static int flexcop_usb_i2c_request(struct flexcop_i2c_adapter *i2c,
flexcop_i2c_port_t port, u8 chipaddr, u8 addr, u8 *buf, u16 len) flexcop_access_op_t op, u8 chipaddr, u8 addr, u8 *buf, u16 len)
{ {
if (op == FC_READ) if (op == FC_READ)
return flexcop_usb_i2c_req(fc->bus_specific,B2C2_USB_I2C_REQUEST,USB_FUNC_I2C_READ,port,chipaddr,addr,buf,len); return flexcop_usb_i2c_req(i2c, B2C2_USB_I2C_REQUEST,
USB_FUNC_I2C_READ, chipaddr, addr, buf, len);
else else
return flexcop_usb_i2c_req(fc->bus_specific,B2C2_USB_I2C_REQUEST,USB_FUNC_I2C_WRITE,port,chipaddr,addr,buf,len); return flexcop_usb_i2c_req(i2c, B2C2_USB_I2C_REQUEST,
USB_FUNC_I2C_WRITE, chipaddr, addr, buf, len);
} }
static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *buffer, int buffer_length) static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *buffer, int buffer_length)
......
...@@ -257,6 +257,12 @@ int flexcop_device_initialize(struct flexcop_device *fc) ...@@ -257,6 +257,12 @@ int flexcop_device_initialize(struct flexcop_device *fc)
if ((ret = flexcop_dvb_init(fc))) if ((ret = flexcop_dvb_init(fc)))
goto error; goto error;
/* i2c has to be done before doing EEProm stuff -
* because the EEProm is accessed via i2c */
ret = flexcop_i2c_init(fc);
if (ret)
goto error;
/* do the MAC address reading after initializing the dvb_adapter */ /* do the MAC address reading after initializing the dvb_adapter */
if (fc->get_mac_addr(fc, 0) == 0) { if (fc->get_mac_addr(fc, 0) == 0) {
u8 *b = fc->dvb_adapter.proposed_mac; u8 *b = fc->dvb_adapter.proposed_mac;
...@@ -266,10 +272,6 @@ int flexcop_device_initialize(struct flexcop_device *fc) ...@@ -266,10 +272,6 @@ int flexcop_device_initialize(struct flexcop_device *fc)
} else } else
warn("reading of MAC address failed.\n"); warn("reading of MAC address failed.\n");
if ((ret = flexcop_i2c_init(fc)))
goto error;
if ((ret = flexcop_frontend_init(fc))) if ((ret = flexcop_frontend_init(fc)))
goto error; goto error;
......
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