diff options
author | Antti Palosaari <crope@iki.fi> | 2015-03-29 18:28:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-02 21:26:16 -0400 |
commit | 0fecb6c0944f841561067a2b7ae8738602f48cdb (patch) | |
tree | b548f953257d128a569714d0f236d569ef143ff8 /drivers/media/usb/dvb-usb/dw2102.c | |
parent | f31a6386000eb1459e89099867723e9bcc513fd6 (diff) |
[media] dw2102: switch ts2022 to ts2020 driver
Change ts2022 driver to ts2020 driver. ts2020 driver supports
both tuner chip models.
That affects TechnoTrend TT-connect S2-4600 DVB-S/S2 device, which
Olli just added.
Cc: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb/dw2102.c')
-rw-r--r-- | drivers/media/usb/dvb-usb/dw2102.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index 9dc36191c744..f1f357f43ff0 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "tda18271.h" | 33 | #include "tda18271.h" |
34 | #include "cxd2820r.h" | 34 | #include "cxd2820r.h" |
35 | #include "m88ds3103.h" | 35 | #include "m88ds3103.h" |
36 | #include "m88ts2022.h" | 36 | #include "ts2020.h" |
37 | 37 | ||
38 | /* Max transfer size done by I2C transfer functions */ | 38 | /* Max transfer size done by I2C transfer functions */ |
39 | #define MAX_XFER_SIZE 64 | 39 | #define MAX_XFER_SIZE 64 |
@@ -1487,9 +1487,7 @@ static int tt_s2_4600_frontend_attach(struct dvb_usb_adapter *adap) | |||
1487 | struct i2c_adapter *i2c_adapter; | 1487 | struct i2c_adapter *i2c_adapter; |
1488 | struct i2c_client *client; | 1488 | struct i2c_client *client; |
1489 | struct i2c_board_info info; | 1489 | struct i2c_board_info info; |
1490 | struct m88ts2022_config m88ts2022_config = { | 1490 | struct ts2020_config ts2020_config = {}; |
1491 | .clock = 27000000, | ||
1492 | }; | ||
1493 | 1491 | ||
1494 | if (dvb_usb_generic_rw(d, obuf, 3, ibuf, 1, 0) < 0) | 1492 | if (dvb_usb_generic_rw(d, obuf, 3, ibuf, 1, 0) < 0) |
1495 | err("command 0x0e transfer failed."); | 1493 | err("command 0x0e transfer failed."); |
@@ -1531,11 +1529,11 @@ static int tt_s2_4600_frontend_attach(struct dvb_usb_adapter *adap) | |||
1531 | return -ENODEV; | 1529 | return -ENODEV; |
1532 | 1530 | ||
1533 | /* attach tuner */ | 1531 | /* attach tuner */ |
1534 | m88ts2022_config.fe = adap->fe_adap[0].fe; | 1532 | ts2020_config.fe = adap->fe_adap[0].fe; |
1535 | strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); | 1533 | strlcpy(info.type, "ts2022", I2C_NAME_SIZE); |
1536 | info.addr = 0x60; | 1534 | info.addr = 0x60; |
1537 | info.platform_data = &m88ts2022_config; | 1535 | info.platform_data = &ts2020_config; |
1538 | request_module("m88ts2022"); | 1536 | request_module("ts2020"); |
1539 | client = i2c_new_device(i2c_adapter, &info); | 1537 | client = i2c_new_device(i2c_adapter, &info); |
1540 | 1538 | ||
1541 | if (client == NULL || client->dev.driver == NULL) { | 1539 | if (client == NULL || client->dev.driver == NULL) { |