summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7164
diff options
context:
space:
mode:
authorOlli Salonen <olli.salonen@iki.fi>2015-05-05 13:54:17 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-12 13:20:55 -0300
commitee3c3e46885946cc041f08ec68e7c5b91b087cbe (patch)
tree2a892ccba55536e6ef5e3cbd71c6bbcdf2f72424 /drivers/media/pci/saa7164
parent7adf99d20ce0e96a70755f452e3a63824b14060f (diff)
downloadblackbird-op-linux-ee3c3e46885946cc041f08ec68e7c5b91b087cbe.tar.gz
blackbird-op-linux-ee3c3e46885946cc041f08ec68e7c5b91b087cbe.zip
[media] si2157: support selection of IF interface
The chips supported by the si2157 driver have two IF outputs (either pins 12+13 or pins 9+11). Instead of hardcoding the output to be used add an option to choose which output shall be used. As this patch changes the default behaviour, the IF interface is specified in each driver currently using si2157 driver. This is to keep bisectability. Signed-off-by: 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/pci/saa7164')
-rw-r--r--drivers/media/pci/saa7164/saa7164-dvb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/pci/saa7164/saa7164-dvb.c
index 99698002a808..e9a783b71b45 100644
--- a/drivers/media/pci/saa7164/saa7164-dvb.c
+++ b/drivers/media/pci/saa7164/saa7164-dvb.c
@@ -111,6 +111,7 @@ static struct lgdt3306a_config hauppauge_hvr2255b_config = {
static struct si2157_config hauppauge_hvr2255_tuner_config = {
.inversion = 1,
+ .if_port = 1,
};
static int si2157_attach(struct saa7164_port *port, struct i2c_adapter *adapter,
@@ -665,6 +666,7 @@ int saa7164_dvb_register(struct saa7164_port *port)
/* attach tuner */
memset(&si2157_config, 0, sizeof(si2157_config));
+ si2157_config.if_port = 1;
si2157_config.fe = port->dvb.frontend;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE);
@@ -710,6 +712,7 @@ int saa7164_dvb_register(struct saa7164_port *port)
/* attach tuner */
memset(&si2157_config, 0, sizeof(si2157_config));
si2157_config.fe = port->dvb.frontend;
+ si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE);
info.addr = 0xc0 >> 1;
OpenPOWER on IntegriCloud