projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
pci
/
cx23885
/
cx23885-dvb.c
diff --git
a/drivers/media/pci/cx23885/cx23885-dvb.c
b/drivers/media/pci/cx23885/cx23885-dvb.c
index 45fbe1e4d2d06348977d7163a1febd150efc7315..745caabe33971f1d279c58d220117d41ce5cb99b 100644
(file)
--- a/
drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/
drivers/media/pci/cx23885/cx23885-dvb.c
@@
-73,7
+73,6
@@
#include "si2157.h"
#include "sp2.h"
#include "m88ds3103.h"
#include "si2157.h"
#include "sp2.h"
#include "m88ds3103.h"
-#include "m88ts2022.h"
#include "m88rs6000t.h"
static unsigned int debug;
#include "m88rs6000t.h"
static unsigned int debug;
@@
-1187,7
+1186,7
@@
static int dvb_register(struct cx23885_tsport *port)
struct vb2_dvb_frontend *fe0, *fe1 = NULL;
struct si2168_config si2168_config;
struct si2157_config si2157_config;
struct vb2_dvb_frontend *fe0, *fe1 = NULL;
struct si2168_config si2168_config;
struct si2157_config si2157_config;
- struct
m88ts2022_config m88ts2022
_config;
+ struct
ts2020_config ts2020
_config;
struct i2c_board_info info;
struct i2c_adapter *adapter;
struct i2c_client *client_demod = NULL, *client_tuner = NULL;
struct i2c_board_info info;
struct i2c_adapter *adapter;
struct i2c_client *client_demod = NULL, *client_tuner = NULL;
@@
-1856,13
+1855,12
@@
static int dvb_register(struct cx23885_tsport *port)
break;
/* attach tuner */
break;
/* attach tuner */
- memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));
- m88ts2022_config.fe = fe0->dvb.frontend;
- m88ts2022_config.clock = 27000000;
+ memset(&ts2020_config, 0, sizeof(ts2020_config));
+ ts2020_config.fe = fe0->dvb.frontend;
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);
client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL ||
request_module(info.type);
client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL ||
@@
-1986,13
+1984,12
@@
static int dvb_register(struct cx23885_tsport *port)
break;
/* attach tuner */
break;
/* attach tuner */
- memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));
- m88ts2022_config.fe = fe0->dvb.frontend;
- m88ts2022_config.clock = 27000000;
+ memset(&ts2020_config, 0, sizeof(ts2020_config));
+ ts2020_config.fe = fe0->dvb.frontend;
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);
client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL)
request_module(info.type);
client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL)
@@
-2032,13
+2029,12
@@
static int dvb_register(struct cx23885_tsport *port)
break;
/* attach tuner */
break;
/* attach tuner */
- memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));
- m88ts2022_config.fe = fe0->dvb.frontend;
- m88ts2022_config.clock = 27000000;
+ memset(&ts2020_config, 0, sizeof(ts2020_config));
+ ts2020_config.fe = fe0->dvb.frontend;
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);
client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL)
request_module(info.type);
client_tuner = i2c_new_device(adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL)