[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>

diff --git a/drivers/media/pci/smipcie/Kconfig b/drivers/media/pci/smipcie/Kconfig
index c8de53f5ea28d8d01367462abd78ce4e2e4b4f24..21a1583dbd8f93866c01c957643544fc900f46cd 100644 (file)
--- 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 36c8ed77309ce63d04f5daa1472406b8fbeb85f1..411592524c63501f23504ec44e3964c57ff22539 100644 (file)
--- 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;