Merge pull request torvalds#97 from bas-t/fixes

Updates for saa716x, following Olli's patches that are merged to upstream today.
jdenson12 · May 18, 2015 · ca628c8 · ca628c8
2 parents 82f104d + 62e0e0e
commit ca628c8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/drivers/media/pci/saa716x/saa716x_budget.c b/drivers/media/pci/saa716x/saa716x_budget.c
@@ -902,6 +902,7 @@ static int saa716x_tbs6281_frontend_attach(struct saa716x_adapter *adapter, int
 	si2168_config.i2c_adapter = &i2cadapter;
 	si2168_config.fe = &adapter->fe;
 	si2168_config.ts_mode = SI2168_TS_PARALLEL;
+	si2168_config.ts_clock_gapped = true;
 	memset(&info, 0, sizeof(struct i2c_board_info));
 	strlcpy(info.type, "si2168", I2C_NAME_SIZE);
 	info.addr = 0x64;
@@ -920,6 +921,7 @@ static int saa716x_tbs6281_frontend_attach(struct saa716x_adapter *adapter, int
 	/* attach tuner */
 	memset(&si2157_config, 0, sizeof(si2157_config));
 	si2157_config.fe = adapter->fe;
+	si2157_config.if_port = 1;
 	memset(&info, 0, sizeof(struct i2c_board_info));
 	strlcpy(info.type, "si2157", I2C_NAME_SIZE);
 	info.addr = 0x60;
@@ -993,6 +995,7 @@ static int saa716x_tbs6285_frontend_attach(struct saa716x_adapter *adapter, int
 	si2168_config.i2c_adapter = &i2cadapter;
 	si2168_config.fe = &adapter->fe;
 	si2168_config.ts_mode = SI2168_TS_SERIAL;
+	si2168_config.ts_clock_gapped = true;
 	memset(&info, 0, sizeof(struct i2c_board_info));
 	strlcpy(info.type, "si2168", I2C_NAME_SIZE);
 	info.addr = ((count == 0) || (count == 2)) ? 0x64 : 0x66;
@@ -1014,6 +1017,7 @@ static int saa716x_tbs6285_frontend_attach(struct saa716x_adapter *adapter, int
 	/* attach tuner */
 	memset(&si2157_config, 0, sizeof(si2157_config));
 	si2157_config.fe = adapter->fe;
+	si2157_config.if_port = 1;
 	memset(&info, 0, sizeof(struct i2c_board_info));
 	strlcpy(info.type, "si2157", I2C_NAME_SIZE);
 	info.addr = ((count == 0) || (count == 2)) ? 0x62 : 0x60;