diff options
Diffstat (limited to 'drivers/media/usb/dvb-usb/dw2102.c')
-rw-r--r-- | drivers/media/usb/dvb-usb/dw2102.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index 6e237b6dd0a8..6136a2c7dbfd 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c | |||
@@ -955,9 +955,10 @@ static struct ds3000_config dw2104_ds3000_config = { | |||
955 | .demod_address = 0x68, | 955 | .demod_address = 0x68, |
956 | }; | 956 | }; |
957 | 957 | ||
958 | static struct ts2020_config dw2104_ts2020_config = { | 958 | static struct ts2020_config dw2104_ts2020_config = { |
959 | .tuner_address = 0x60, | 959 | .tuner_address = 0x60, |
960 | .clk_out_div = 1, | 960 | .clk_out_div = 1, |
961 | .frequency_div = 1060000, | ||
961 | }; | 962 | }; |
962 | 963 | ||
963 | static struct ds3000_config s660_ds3000_config = { | 964 | static struct ds3000_config s660_ds3000_config = { |
@@ -966,6 +967,12 @@ static struct ds3000_config s660_ds3000_config = { | |||
966 | .set_lock_led = dw210x_led_ctrl, | 967 | .set_lock_led = dw210x_led_ctrl, |
967 | }; | 968 | }; |
968 | 969 | ||
970 | static struct ts2020_config s660_ts2020_config = { | ||
971 | .tuner_address = 0x60, | ||
972 | .clk_out_div = 1, | ||
973 | .frequency_div = 1146000, | ||
974 | }; | ||
975 | |||
969 | static struct stv0900_config dw2104a_stv0900_config = { | 976 | static struct stv0900_config dw2104a_stv0900_config = { |
970 | .demod_address = 0x6a, | 977 | .demod_address = 0x6a, |
971 | .demod_mode = 0, | 978 | .demod_mode = 0, |
@@ -1205,7 +1212,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d) | |||
1205 | if (d->fe_adap[0].fe == NULL) | 1212 | if (d->fe_adap[0].fe == NULL) |
1206 | return -EIO; | 1213 | return -EIO; |
1207 | 1214 | ||
1208 | dvb_attach(ts2020_attach, d->fe_adap[0].fe, &dw2104_ts2020_config, | 1215 | dvb_attach(ts2020_attach, d->fe_adap[0].fe, &s660_ts2020_config, |
1209 | &d->dev->i2c_adap); | 1216 | &d->dev->i2c_adap); |
1210 | 1217 | ||
1211 | st->old_set_voltage = d->fe_adap[0].fe->ops.set_voltage; | 1218 | st->old_set_voltage = d->fe_adap[0].fe->ops.set_voltage; |
@@ -1213,7 +1220,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d) | |||
1213 | 1220 | ||
1214 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); | 1221 | dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); |
1215 | 1222 | ||
1216 | info("Attached ds3000+ds2020!\n"); | 1223 | info("Attached ds3000+ts2020!\n"); |
1217 | 1224 | ||
1218 | return 0; | 1225 | return 0; |
1219 | } | 1226 | } |