diff options
author | Antti Palosaari <crope@iki.fi> | 2010-09-09 13:59:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:05:51 -0400 |
commit | ab07fdd69116d877d4fdb6a8f6355a02e65e6be0 (patch) | |
tree | aec2c5fd330136f210059300ca8f28ed42cf73f0 /drivers/media/dvb/dvb-usb/af9015.c | |
parent | a4f31d0da5c6807a0f5dfc7d285d8d4bdaa1e36e (diff) |
V4L/DVB: af9015: add support for TerraTec Cinergy T Stick Dual RC
Add USB ID [0ccd:0099] for TerraTec Cinergy T Stick Dual RC.
Device is based for AF9015 + AF9013 + 2 x MxL5007T chips.
Thanks to the TerraTec!
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9015.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index b5fdcc2cb543..bf8075c77930 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "mxl5005s.h" | 32 | #include "mxl5005s.h" |
33 | #include "mc44s803.h" | 33 | #include "mc44s803.h" |
34 | #include "tda18218.h" | 34 | #include "tda18218.h" |
35 | #include "mxl5007t.h" | ||
35 | 36 | ||
36 | static int dvb_usb_af9015_debug; | 37 | static int dvb_usb_af9015_debug; |
37 | module_param_named(debug, dvb_usb_af9015_debug, int, 0644); | 38 | module_param_named(debug, dvb_usb_af9015_debug, int, 0644); |
@@ -999,6 +1000,7 @@ static int af9015_read_config(struct usb_device *udev) | |||
999 | case AF9013_TUNER_MXL5003D: | 1000 | case AF9013_TUNER_MXL5003D: |
1000 | case AF9013_TUNER_MXL5005D: | 1001 | case AF9013_TUNER_MXL5005D: |
1001 | case AF9013_TUNER_MXL5005R: | 1002 | case AF9013_TUNER_MXL5005R: |
1003 | case AF9013_TUNER_MXL5007T: | ||
1002 | af9015_af9013_config[i].rf_spec_inv = 0; | 1004 | af9015_af9013_config[i].rf_spec_inv = 0; |
1003 | break; | 1005 | break; |
1004 | case AF9013_TUNER_MC44S803: | 1006 | case AF9013_TUNER_MC44S803: |
@@ -1212,6 +1214,11 @@ static struct tda18218_config af9015_tda18218_config = { | |||
1212 | .i2c_wr_max = 21, /* max wr bytes AF9015 I2C adap can handle at once */ | 1214 | .i2c_wr_max = 21, /* max wr bytes AF9015 I2C adap can handle at once */ |
1213 | }; | 1215 | }; |
1214 | 1216 | ||
1217 | static struct mxl5007t_config af9015_mxl5007t_config = { | ||
1218 | .xtal_freq_hz = MxL_XTAL_24_MHZ, | ||
1219 | .if_freq_hz = MxL_IF_4_57_MHZ, | ||
1220 | }; | ||
1221 | |||
1215 | static int af9015_tuner_attach(struct dvb_usb_adapter *adap) | 1222 | static int af9015_tuner_attach(struct dvb_usb_adapter *adap) |
1216 | { | 1223 | { |
1217 | struct af9015_state *state = adap->dev->priv; | 1224 | struct af9015_state *state = adap->dev->priv; |
@@ -1263,6 +1270,10 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap) | |||
1263 | ret = dvb_attach(mc44s803_attach, adap->fe, i2c_adap, | 1270 | ret = dvb_attach(mc44s803_attach, adap->fe, i2c_adap, |
1264 | &af9015_mc44s803_config) == NULL ? -ENODEV : 0; | 1271 | &af9015_mc44s803_config) == NULL ? -ENODEV : 0; |
1265 | break; | 1272 | break; |
1273 | case AF9013_TUNER_MXL5007T: | ||
1274 | ret = dvb_attach(mxl5007t_attach, adap->fe, i2c_adap, | ||
1275 | 0xc0, &af9015_mxl5007t_config) == NULL ? -ENODEV : 0; | ||
1276 | break; | ||
1266 | case AF9013_TUNER_UNKNOWN: | 1277 | case AF9013_TUNER_UNKNOWN: |
1267 | default: | 1278 | default: |
1268 | ret = -ENODEV; | 1279 | ret = -ENODEV; |
@@ -1309,6 +1320,8 @@ static struct usb_device_id af9015_usb_table[] = { | |||
1309 | {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)}, | 1320 | {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)}, |
1310 | {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)}, | 1321 | {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)}, |
1311 | {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_RC)}, | 1322 | {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_RC)}, |
1323 | {USB_DEVICE(USB_VID_TERRATEC, | ||
1324 | USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)}, | ||
1312 | {0}, | 1325 | {0}, |
1313 | }; | 1326 | }; |
1314 | MODULE_DEVICE_TABLE(usb, af9015_usb_table); | 1327 | MODULE_DEVICE_TABLE(usb, af9015_usb_table); |
@@ -1370,7 +1383,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
1370 | 1383 | ||
1371 | .i2c_algo = &af9015_i2c_algo, | 1384 | .i2c_algo = &af9015_i2c_algo, |
1372 | 1385 | ||
1373 | .num_device_descs = 10, /* check max from dvb-usb.h */ | 1386 | .num_device_descs = 11, /* check max from dvb-usb.h */ |
1374 | .devices = { | 1387 | .devices = { |
1375 | { | 1388 | { |
1376 | .name = "Afatech AF9015 DVB-T USB2.0 stick", | 1389 | .name = "Afatech AF9015 DVB-T USB2.0 stick", |
@@ -1427,6 +1440,11 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
1427 | .cold_ids = {&af9015_usb_table[33], NULL}, | 1440 | .cold_ids = {&af9015_usb_table[33], NULL}, |
1428 | .warm_ids = {NULL}, | 1441 | .warm_ids = {NULL}, |
1429 | }, | 1442 | }, |
1443 | { | ||
1444 | .name = "TerraTec Cinergy T Stick Dual RC", | ||
1445 | .cold_ids = {&af9015_usb_table[34], NULL}, | ||
1446 | .warm_ids = {NULL}, | ||
1447 | }, | ||
1430 | } | 1448 | } |
1431 | }, { | 1449 | }, { |
1432 | .caps = DVB_USB_IS_AN_I2C_ADAPTER, | 1450 | .caps = DVB_USB_IS_AN_I2C_ADAPTER, |