diff options
| author | Antti Palosaari <crope@iki.fi> | 2015-03-24 02:22:28 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-03 04:25:14 +0300 |
| commit | 2ad8dd417a6af899d6298869bf6d2f76b1eab6a6 (patch) | |
| tree | f790e50f0fc326798c7e1dd7a108e2b15ac2719b /drivers/media/pci/smipcie | |
| parent | d76e08784cb8c08669613b6c1103452b5e4094c0 (diff) | |
| download | linux-2ad8dd417a6af899d6298869bf6d2f76b1eab6a6.tar.xz | |
[media] smipcie: switch ts2022 to ts2020 driver
Change ts2022 driver to ts2020 driver. ts2020 driver supports
both tuner chip models.
Cc: Nibble Max <nibble.max@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/smipcie')
| -rw-r--r-- | drivers/media/pci/smipcie/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/pci/smipcie/smipcie.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/pci/smipcie/Kconfig b/drivers/media/pci/smipcie/Kconfig index c8de53f5ea28..21a1583dbd8f 100644 --- a/drivers/media/pci/smipcie/Kconfig +++ b/drivers/media/pci/smipcie/Kconfig @@ -4,7 +4,7 @@ config DVB_SMIPCIE select I2C_ALGOBIT select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT + select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT help diff --git a/drivers/media/pci/smipcie/smipcie.c b/drivers/media/pci/smipcie/smipcie.c index 36c8ed77309c..411592524c63 100644 --- a/drivers/media/pci/smipcie/smipcie.c +++ b/drivers/media/pci/smipcie/smipcie.c @@ -16,7 +16,7 @@ #include "smipcie.h" #include "m88ds3103.h" -#include "m88ts2022.h" +#include "ts2020.h" #include "m88rs6000t.h" #include "si2168.h" #include "si2157.h" @@ -532,9 +532,7 @@ static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port) struct i2c_adapter *tuner_i2c_adapter; struct i2c_client *tuner_client; struct i2c_board_info tuner_info; - struct m88ts2022_config m88ts2022_config = { - .clock = 27000000, - }; + struct ts2020_config ts2020_config = {}; memset(&tuner_info, 0, sizeof(struct i2c_board_info)); i2c = (port->idx == 0) ? &dev->i2c_bus[0] : &dev->i2c_bus[1]; @@ -546,10 +544,10 @@ static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port) return ret; } /* attach tuner */ - m88ts2022_config.fe = port->fe; - strlcpy(tuner_info.type, "m88ts2022", I2C_NAME_SIZE); + ts2020_config.fe = port->fe; + strlcpy(tuner_info.type, "ts2020", I2C_NAME_SIZE); tuner_info.addr = 0x60; - tuner_info.platform_data = &m88ts2022_config; + tuner_info.platform_data = &ts2020_config; tuner_client = smi_add_i2c_client(tuner_i2c_adapter, &tuner_info); if (!tuner_client) { ret = -ENODEV; |