Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] rtl28xxu: use muxed RTL2832 I2C adapters for E4000 and RTL2832_SDR

Browse Source 
RTL2832 driver provides muxed I2C adapters for tuner bus I2C gate
control. Pass those adapters to rtl2832_sdr and e4000 modules in order
to get rid of proprietary DVB .i2c_gate_ctrl() callback use.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Antti Palosaari 2014-02-08 04:03:57 -03:00 committed by Mauro Carvalho Chehab
parent 3d0a73aaa9
commit ae1f8453e8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View File

@ -774,6 +774,9 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
goto err; goto err;
} }
/* RTL2832 I2C repeater */
priv->demod_i2c_adapter = rtl2832_get_i2c_adapter(adap->fe[0]);
/* set fe callback */ /* set fe callback */
adap->fe[0]->callback = rtl2832u_frontend_callback; adap->fe[0]->callback = rtl2832u_frontend_callback;
@ -922,6 +925,8 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
break; break;
case TUNER_RTL2832_E4000: { case TUNER_RTL2832_E4000: {
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
struct i2c_adapter *i2c_adap_internal =
rtl2832_get_private_i2c_adapter(adap->fe[0]);
struct e4000_config e4000_config = { struct e4000_config e4000_config = {
.fe = adap->fe[0], .fe = adap->fe[0],
.clock = 28800000, .clock = 28800000,
@ -932,7 +937,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
info.platform_data = &e4000_config; info.platform_data = &e4000_config;
request_module(info.type); request_module(info.type);
client = i2c_new_device(&d->i2c_adap, &info); client = i2c_new_device(priv->demod_i2c_adapter, &info);
if (client == NULL || client->dev.driver == NULL) if (client == NULL || client->dev.driver == NULL)
break; break;
@ -943,10 +948,11 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
priv->client = client; priv->client = client;
sd = i2c_get_clientdata(client); sd = i2c_get_clientdata(client);
i2c_set_adapdata(i2c_adap_internal, d);
/* attach SDR */ /* attach SDR */
dvb_attach(rtl2832_sdr_attach, adap->fe[0], dvb_attach(rtl2832_sdr_attach, adap->fe[0],
&d->i2c_adap, i2c_adap_internal,
&rtl28xxu_rtl2832_e4000_config, sd); &rtl28xxu_rtl2832_e4000_config, sd);
} }
break; break;

1
drivers/media/usb/dvb-usb-v2/rtl28xxu.h
View File

@ -55,6 +55,7 @@ struct rtl28xxu_priv {
u8 tuner; u8 tuner;
char *tuner_name; char *tuner_name;
u8 page; /* integrated demod active register page */ u8 page; /* integrated demod active register page */
struct i2c_adapter *demod_i2c_adapter;
bool rc_active; bool rc_active;
struct i2c_client *client; struct i2c_client *client;
}; };