[PATCH 1/1] cx23885-dvb: fix ds3000 ts2020 split for TEVII S471

[PATCH 1/1] cx23885-dvb: fix ds3000 ts2020 split for TEVII S471

[Christian Volkmann]

A split for ds3000/ts2020 code forgot to change the TEVII_S471 code.
Change the TEVII_S471 according the changes to TEVII_S470.

Signed-off-by: Christian Volkmann <cv@cv-sv.de>
---
 drivers/media/pci/cx23885/cx23885-dvb.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 9c5ed10..be98c49 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1038,7 +1038,6 @@ static int dvb_register(struct cx23885_tsport *port)
 				&tevii_ts2020_config, &i2c_bus->i2c_adap);
 			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
 		}
-
 		break;
 	case CX23885_BOARD_DVBWORLD_2005:
 		i2c_bus = &dev->i2c_bus[1];
@@ -1249,6 +1248,11 @@ static int dvb_register(struct cx23885_tsport *port)
 		fe0->dvb.frontend = dvb_attach(ds3000_attach,
 					&tevii_ds3000_config,
 					&i2c_bus->i2c_adap);
+		if (fe0->dvb.frontend != NULL) {
+			dvb_attach(ts2020_attach, fe0->dvb.frontend,
+				&tevii_ts2020_config, &i2c_bus->i2c_adap);
+			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
+		}
 		break;
 	case CX23885_BOARD_PROF_8000:
 		i2c_bus = &dev->i2c_bus[0];
-- 
1.8.1.4

Re: [PATCH 1/1] cx23885-dvb: fix ds3000 ts2020 split for TEVII S471

[Mauro Carvalho Chehab]

Hi Christian,

Em Wed, 14 Aug 2013 22:58:47 +0200
Christian Volkmann <cv@cv-sv.de> escreveu:

> A split for ds3000/ts2020 code forgot to change the TEVII_S471 code.
> Change the TEVII_S471 according the changes to TEVII_S470.
> 
> Signed-off-by: Christian Volkmann <cv@cv-sv.de>
> ---
>  drivers/media/pci/cx23885/cx23885-dvb.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
> index 9c5ed10..be98c49 100644
> --- a/drivers/media/pci/cx23885/cx23885-dvb.c
> +++ b/drivers/media/pci/cx23885/cx23885-dvb.c
> @@ -1038,7 +1038,6 @@ static int dvb_register(struct cx23885_tsport *port)
>  				&tevii_ts2020_config, &i2c_bus->i2c_adap);
>  			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
>  		}
> -
>  		break;
>  	case CX23885_BOARD_DVBWORLD_2005:
>  		i2c_bus = &dev->i2c_bus[1];
> @@ -1249,6 +1248,11 @@ static int dvb_register(struct cx23885_tsport *port)
>  		fe0->dvb.frontend = dvb_attach(ds3000_attach,
>  					&tevii_ds3000_config,
>  					&i2c_bus->i2c_adap);
> +		if (fe0->dvb.frontend != NULL) {
> +			dvb_attach(ts2020_attach, fe0->dvb.frontend,
> +				&tevii_ts2020_config, &i2c_bus->i2c_adap);
> +			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
> +		}
>  		break;
>  	case CX23885_BOARD_PROF_8000:
>  		i2c_bus = &dev->i2c_bus[0];


A similar patch got applied already, sent by Johannes:

commit b43ea8068d2090cb1e44632c8a938ab40d2c7419
Author: Johannes Koch <johannes@ortsraum.de>
Date:   Wed Jul 17 14:28:16 2013 -0300

    [media] cx23885: Fix TeVii S471 regression since introduction of ts2020
    
    Patch to make TeVii S471 cards use the ts2020 tuner, since ds3000 driver no
    longer contains tuning code.
    
    Signed-off-by: Johannes Koch <johannes@ortsraum.de>
    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

The difference between your patch and the applied one is:

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 971e4ff..8ed7b94 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1055,7 +1055,6 @@ static int dvb_register(struct cx23885_tsport *port)
 				&tevii_ts2020_config, &i2c_bus->i2c_adap);
 			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
 		}
-
 		break;
 	case CX23885_BOARD_DVBWORLD_2005:
 		i2c_bus = &dev->i2c_bus[1];
@@ -1285,6 +1284,7 @@ static int dvb_register(struct cx23885_tsport *port)
 		if (fe0->dvb.frontend != NULL) {
 			dvb_attach(ts2020_attach, fe0->dvb.frontend,
 				&tevii_ts2020_config, &i2c_bus->i2c_adap);
+			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
 		}
 		break;
 	case CX23885_BOARD_PROF_8000:


So, basically, on our patch, you're also filling ops.set_voltage. 

As I don't know the board details, I can't tell if this is required or
not.

Christian/Johannes,

Could you please double-check it? If this is needed, please send me a new
patch, rebased on the top of linux-media git tree.

Thanks!
Mauro

Re: [PATCH 1/1] cx23885-dvb: fix ds3000 ts2020 split for TEVII S471

[Johannes Koch]

Hi  Mauro,

On Thu, Sep 26, 2013 at 01:51:57PM -0300, Mauro Carvalho Chehab wrote:
> The difference between your patch and the applied one is:
> 
> diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
> index 971e4ff..8ed7b94 100644
> --- a/drivers/media/pci/cx23885/cx23885-dvb.c
> +++ b/drivers/media/pci/cx23885/cx23885-dvb.c
> @@ -1055,7 +1055,6 @@ static int dvb_register(struct cx23885_tsport *port)
>  				&tevii_ts2020_config, &i2c_bus->i2c_adap);
>  			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
>  		}
> -
>  		break;
>  	case CX23885_BOARD_DVBWORLD_2005:
>  		i2c_bus = &dev->i2c_bus[1];
> @@ -1285,6 +1284,7 @@ static int dvb_register(struct cx23885_tsport *port)
>  		if (fe0->dvb.frontend != NULL) {
>  			dvb_attach(ts2020_attach, fe0->dvb.frontend,
>  				&tevii_ts2020_config, &i2c_bus->i2c_adap);
> +			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
>  		}
>  		break;
>  	case CX23885_BOARD_PROF_8000:
> 
> 
> So, basically, on our patch, you're also filling ops.set_voltage. 
> 
> As I don't know the board details, I can't tell if this is required or
> not.
> 
> Christian/Johannes,
> 
> Could you please double-check it? If this is needed, please send me a new
> patch, rebased on the top of linux-media git tree.

no, setting the voltage via dvb.frontend->ops.set_voltage is not needed for
the TeVii S471. See also the patch that introduced S471 support:
https://linuxtv.org/patch/11189/.

Best regards
 Johannes