Commit d76e0878 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab

[media] cx23885: switch ts2022 to ts2020 driver

Change ts2022 driver to ts2020 driver. ts2020 driver supports
both chip models.

Cc: Olli Salonen <olli.salonen@iki.fi>
Cc: Nibble Max <nibble.max@gmail.com>
Tested-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 83c1b6ce
...@@ -40,7 +40,6 @@ config VIDEO_CX23885 ...@@ -40,7 +40,6 @@ config VIDEO_CX23885
select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT
select DVB_TUNER_DIB0070 if MEDIA_SUBDRV_AUTOSELECT select DVB_TUNER_DIB0070 if MEDIA_SUBDRV_AUTOSELECT
---help--- ---help---
......
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
#include "si2157.h" #include "si2157.h"
#include "sp2.h" #include "sp2.h"
#include "m88ds3103.h" #include "m88ds3103.h"
#include "m88ts2022.h"
#include "m88rs6000t.h" #include "m88rs6000t.h"
static unsigned int debug; static unsigned int debug;
...@@ -1187,7 +1186,7 @@ static int dvb_register(struct cx23885_tsport *port) ...@@ -1187,7 +1186,7 @@ static int dvb_register(struct cx23885_tsport *port)
struct vb2_dvb_frontend *fe0, *fe1 = NULL; struct vb2_dvb_frontend *fe0, *fe1 = NULL;
struct si2168_config si2168_config; struct si2168_config si2168_config;
struct si2157_config si2157_config; struct si2157_config si2157_config;
struct m88ts2022_config m88ts2022_config; struct ts2020_config ts2020_config;
struct i2c_board_info info; struct i2c_board_info info;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
struct i2c_client *client_demod = NULL, *client_tuner = NULL; struct i2c_client *client_demod = NULL, *client_tuner = NULL;
...@@ -1856,13 +1855,12 @@ static int dvb_register(struct cx23885_tsport *port) ...@@ -1856,13 +1855,12 @@ static int dvb_register(struct cx23885_tsport *port)
break; break;
/* attach tuner */ /* attach tuner */
memset(&m88ts2022_config, 0, sizeof(m88ts2022_config)); memset(&ts2020_config, 0, sizeof(ts2020_config));
m88ts2022_config.fe = fe0->dvb.frontend; ts2020_config.fe = fe0->dvb.frontend;
m88ts2022_config.clock = 27000000;
memset(&info, 0, sizeof(struct i2c_board_info)); memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
info.addr = 0x60; info.addr = 0x60;
info.platform_data = &m88ts2022_config; info.platform_data = &ts2020_config;
request_module(info.type); request_module(info.type);
client_tuner = i2c_new_device(adapter, &info); client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || if (client_tuner == NULL ||
...@@ -1986,13 +1984,12 @@ static int dvb_register(struct cx23885_tsport *port) ...@@ -1986,13 +1984,12 @@ static int dvb_register(struct cx23885_tsport *port)
break; break;
/* attach tuner */ /* attach tuner */
memset(&m88ts2022_config, 0, sizeof(m88ts2022_config)); memset(&ts2020_config, 0, sizeof(ts2020_config));
m88ts2022_config.fe = fe0->dvb.frontend; ts2020_config.fe = fe0->dvb.frontend;
m88ts2022_config.clock = 27000000;
memset(&info, 0, sizeof(struct i2c_board_info)); memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
info.addr = 0x60; info.addr = 0x60;
info.platform_data = &m88ts2022_config; info.platform_data = &ts2020_config;
request_module(info.type); request_module(info.type);
client_tuner = i2c_new_device(adapter, &info); client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL) if (client_tuner == NULL || client_tuner->dev.driver == NULL)
...@@ -2032,13 +2029,12 @@ static int dvb_register(struct cx23885_tsport *port) ...@@ -2032,13 +2029,12 @@ static int dvb_register(struct cx23885_tsport *port)
break; break;
/* attach tuner */ /* attach tuner */
memset(&m88ts2022_config, 0, sizeof(m88ts2022_config)); memset(&ts2020_config, 0, sizeof(ts2020_config));
m88ts2022_config.fe = fe0->dvb.frontend; ts2020_config.fe = fe0->dvb.frontend;
m88ts2022_config.clock = 27000000;
memset(&info, 0, sizeof(struct i2c_board_info)); memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
info.addr = 0x60; info.addr = 0x60;
info.platform_data = &m88ts2022_config; info.platform_data = &ts2020_config;
request_module(info.type); request_module(info.type);
client_tuner = i2c_new_device(adapter, &info); client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL) if (client_tuner == NULL || client_tuner->dev.driver == NULL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment