Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 599bedb7 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx_dvb: use demod_i2c for demod attach 



Tested:
* CX231XX_BOARD_HAUPPAUGE_930C_HD_1113xx
* CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx

Not Tested:
* CX231XX_BOARD_HAUPPAUGE_EXETER
* CX231XX_BOARD_HAUPPAUGE_955Q

Signed-off-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9bca6266

drivers/media/usb/cx231xx/cx231xx-cards.c

+4 −4
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ struct cx231xx_board cx231xx_boards[] = { 
		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = I2C_1_MUX_1,

		.demod_i2c_master = I2C_2,

		.demod_i2c_master = I2C_1_MUX_1,

		.has_dvb = 1,

		.demod_addr = 0x0e,

		.norm = V4L2_STD_NTSC,
@@ -713,7 +713,7 @@ struct cx231xx_board cx231xx_boards[] = { 
		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = I2C_1_MUX_3,

		.demod_i2c_master = I2C_2,

		.demod_i2c_master = I2C_1_MUX_3,

		.has_dvb = 1,

		.demod_addr = 0x0e,

		.norm = V4L2_STD_PAL,
@@ -752,7 +752,7 @@ struct cx231xx_board cx231xx_boards[] = { 
		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = I2C_1_MUX_3,

		.demod_i2c_master = I2C_2,

		.demod_i2c_master = I2C_1_MUX_3,

		.has_dvb = 1,

		.demod_addr = 0x0e,

		.norm = V4L2_STD_PAL,
@@ -791,7 +791,7 @@ struct cx231xx_board cx231xx_boards[] = { 
		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.tuner_i2c_master = I2C_1_MUX_3,

		.demod_i2c_master = I2C_2,

		.demod_i2c_master = I2C_1_MUX_3,

		.has_dvb = 1,

		.demod_addr = 0x0e,

		.norm = V4L2_STD_NTSC,

drivers/media/usb/cx231xx/cx231xx-dvb.c

+4 −4
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static int dvb_init(struct cx231xx *dev) 


		dev->dvb->frontend = dvb_attach(lgdt3305_attach,

						&hcw_lgdt3305_config,

						tuner_i2c);

						demod_i2c);



		if (dev->dvb->frontend == NULL) {

			dev_err(dev->dev,
@@ -746,7 +746,7 @@ static int dvb_init(struct cx231xx *dev) 


		dev->dvb->frontend = dvb_attach(si2165_attach,

			&hauppauge_930C_HD_1113xx_si2165_config,

			tuner_i2c

			demod_i2c

			);



		if (dev->dvb->frontend == NULL) {
@@ -779,7 +779,7 @@ static int dvb_init(struct cx231xx *dev) 


		dev->dvb->frontend = dvb_attach(si2165_attach,

			&pctv_quatro_stick_1114xx_si2165_config,

			tuner_i2c

			demod_i2c

			);



		if (dev->dvb->frontend == NULL) {
@@ -835,7 +835,7 @@ static int dvb_init(struct cx231xx *dev) 


		dev->dvb->frontend = dvb_attach(lgdt3306a_attach,

			&hauppauge_955q_lgdt3306a_config,

			tuner_i2c

			demod_i2c

			);



		if (dev->dvb->frontend == NULL) {