p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] af9035: bind fc2580 using I2C binding 

Change fc2580 driver from media binding to I2C client binding.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Antti Palosaari 2015-04-14 20:07:16 -03:00 committed by Mauro Carvalho Chehab
parent 35fc0e0fcb
commit 7a893ba9c8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/usb/dvb-usb-v2/af9035.c
View File

@ -1265,11 +1265,6 @@ static struct tda18218_config af9035_tda18218_config = {
.i2c_wr_max = 21, .i2c_wr_max = 21,
}; };
static const struct fc2580_config af9035_fc2580_config = {
.i2c_addr = 0x56,
.clock = 16384000,
};
static const struct fc0012_config af9035_fc0012_config[] = { static const struct fc0012_config af9035_fc0012_config[] = {
{ {
.i2c_address = 0x63, .i2c_address = 0x63,
@ -1390,7 +1385,11 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
fe = dvb_attach(tda18218_attach, adap->fe[0], fe = dvb_attach(tda18218_attach, adap->fe[0],
&d->i2c_adap, &af9035_tda18218_config); &d->i2c_adap, &af9035_tda18218_config);
break; break;
case AF9033_TUNER_FC2580: case AF9033_TUNER_FC2580: {
struct fc2580_platform_data fc2580_pdata = {
.dvb_frontend = adap->fe[0],
};
/* Tuner enable using gpiot2_o, gpiot2_en and gpiot2_on */ /* Tuner enable using gpiot2_o, gpiot2_en and gpiot2_on */
ret = af9035_wr_reg_mask(d, 0xd8eb, 0x01, 0x01); ret = af9035_wr_reg_mask(d, 0xd8eb, 0x01, 0x01);
if (ret < 0) if (ret < 0)
@ -1406,9 +1405,14 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
usleep_range(10000, 50000); usleep_range(10000, 50000);
/* attach tuner */ /* attach tuner */
fe = dvb_attach(fc2580_attach, adap->fe[0], ret = af9035_add_i2c_dev(d, "fc2580", 0x56, &fc2580_pdata,
&d->i2c_adap, &af9035_fc2580_config); &d->i2c_adap);
if (ret)
goto err;
fe = adap->fe[0];
break; break;
}
case AF9033_TUNER_FC0012: case AF9033_TUNER_FC0012:
/* /*
* AF9035 gpiot2 = FC0012 enable * AF9035 gpiot2 = FC0012 enable
@ -1612,6 +1616,7 @@ static int af9035_tuner_detach(struct dvb_usb_adapter *adap)
dev_dbg(&d->udev->dev, "%s: adap->id=%d\n", __func__, adap->id); dev_dbg(&d->udev->dev, "%s: adap->id=%d\n", __func__, adap->id);
switch (state->af9033_config[adap->id].tuner) { switch (state->af9033_config[adap->id].tuner) {
case AF9033_TUNER_FC2580:
case AF9033_TUNER_IT9135_38: case AF9033_TUNER_IT9135_38:
case AF9033_TUNER_IT9135_51: case AF9033_TUNER_IT9135_51:
case AF9033_TUNER_IT9135_52: case AF9033_TUNER_IT9135_52: