[PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Philipp Zabel]

The Terratec Cinergy S2 USB BOX uses a Montage M88TS2022 tuner
and a M88DS3103 demodulator, same as Technotrend TT-connect S2-4600.
This patch adds the missing USB Product ID to make it work.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/media/usb/dvb-usb/dw2102.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 14ef25d..9d18801 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -1688,6 +1688,7 @@ enum dw2102_table_entry {
 	TECHNOTREND_S2_4600,
 	TEVII_S482_1,
 	TEVII_S482_2,
+	TERRATEC_CINERGY_S2_BOX,
 };
 
 static struct usb_device_id dw2102_table[] = {
@@ -1715,6 +1716,7 @@ static struct usb_device_id dw2102_table[] = {
 		USB_PID_TECHNOTREND_CONNECT_S2_4600)},
 	[TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)},
 	[TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)},
+	[TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, 0x0105)},
 	{ }
 };
 
@@ -2232,7 +2234,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
 		} },
 		}
 	},
-	.num_device_descs = 3,
+	.num_device_descs = 4,
 	.devices = {
 		{ "TechnoTrend TT-connect S2-4600",
 			{ &dw2102_table[TECHNOTREND_S2_4600], NULL },
@@ -2246,6 +2248,10 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
 			{ &dw2102_table[TEVII_S482_2], NULL },
 			{ NULL },
 		},
+		{ "Terratec Cinergy S2 USB BOX",
+			{ &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL },
+			{ NULL },
+		},
 	}
 };
 
-- 
2.6.2

Re: [PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Olli Salonen]

Hi guys,

It seems Philipp added the support for this device in dw2102 driver
and Benjamin did that for the dvbsky driver a bit earlier.

# grep -i 0ccdp0105 /lib/modules/$(uname -r)/modules.alias
alias usb:v0CCDp0105d*dc*dsc*dp*ic*isc*ip*in* dvb_usb_dvbsky
alias usb:v0CCDp0105d*dc*dsc*dp*ic*isc*ip*in* dvb_usb_dw2102

Any suggestions on how to resolve this conflict?

Cheers,
-olli

On 4 January 2016 at 20:32, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> The Terratec Cinergy S2 USB BOX uses a Montage M88TS2022 tuner
> and a M88DS3103 demodulator, same as Technotrend TT-connect S2-4600.
> This patch adds the missing USB Product ID to make it work.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  drivers/media/usb/dvb-usb/dw2102.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
> index 14ef25d..9d18801 100644
> --- a/drivers/media/usb/dvb-usb/dw2102.c
> +++ b/drivers/media/usb/dvb-usb/dw2102.c
> @@ -1688,6 +1688,7 @@ enum dw2102_table_entry {
>         TECHNOTREND_S2_4600,
>         TEVII_S482_1,
>         TEVII_S482_2,
> +       TERRATEC_CINERGY_S2_BOX,
>  };
>
>  static struct usb_device_id dw2102_table[] = {
> @@ -1715,6 +1716,7 @@ static struct usb_device_id dw2102_table[] = {
>                 USB_PID_TECHNOTREND_CONNECT_S2_4600)},
>         [TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)},
>         [TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)},
> +       [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, 0x0105)},
>         { }
>  };
>
> @@ -2232,7 +2234,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
>                 } },
>                 }
>         },
> -       .num_device_descs = 3,
> +       .num_device_descs = 4,
>         .devices = {
>                 { "TechnoTrend TT-connect S2-4600",
>                         { &dw2102_table[TECHNOTREND_S2_4600], NULL },
> @@ -2246,6 +2248,10 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
>                         { &dw2102_table[TEVII_S482_2], NULL },
>                         { NULL },
>                 },
> +               { "Terratec Cinergy S2 USB BOX",
> +                       { &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL },
> +                       { NULL },
> +               },
>         }
>  };
>
> --
> 2.6.2
>

Re: [PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Mauro Carvalho Chehab]

Em Sat, 16 Jul 2016 18:26:35 +0200
Olli Salonen <olli.salonen@iki.fi> escreveu:

> Hi guys,
> 
> It seems Philipp added the support for this device in dw2102 driver
> and Benjamin did that for the dvbsky driver a bit earlier.
> 
> # grep -i 0ccdp0105 /lib/modules/$(uname -r)/modules.alias
> alias usb:v0CCDp0105d*dc*dsc*dp*ic*isc*ip*in* dvb_usb_dvbsky
> alias usb:v0CCDp0105d*dc*dsc*dp*ic*isc*ip*in* dvb_usb_dw2102
> 
> Any suggestions on how to resolve this conflict?

Let me understand something: the same chipset is supported by both
modules? Or the device at dvbsky uses a different hardware than
the one at dw2102? In the latter case, sometimes it is possible
to distinguish the hardware based on the USB release info. We have
a few cases like that. One that comes on my mind is a pixelview
device, that uses the same ID for two different devices:

cx231xx:

{USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000, 0x4001),
	 .driver_info = CX231XX_BOARD_PV_PLAYTV_USB_HYBRID},

dib0700:

    { USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x000, 0x3f00) },

Regards,
Mauro



> 
> Cheers,
> -olli
> 
> On 4 January 2016 at 20:32, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> > The Terratec Cinergy S2 USB BOX uses a Montage M88TS2022 tuner
> > and a M88DS3103 demodulator, same as Technotrend TT-connect S2-4600.
> > This patch adds the missing USB Product ID to make it work.
> >
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  drivers/media/usb/dvb-usb/dw2102.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
> > index 14ef25d..9d18801 100644
> > --- a/drivers/media/usb/dvb-usb/dw2102.c
> > +++ b/drivers/media/usb/dvb-usb/dw2102.c
> > @@ -1688,6 +1688,7 @@ enum dw2102_table_entry {
> >         TECHNOTREND_S2_4600,
> >         TEVII_S482_1,
> >         TEVII_S482_2,
> > +       TERRATEC_CINERGY_S2_BOX,
> >  };
> >
> >  static struct usb_device_id dw2102_table[] = {
> > @@ -1715,6 +1716,7 @@ static struct usb_device_id dw2102_table[] = {
> >                 USB_PID_TECHNOTREND_CONNECT_S2_4600)},
> >         [TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)},
> >         [TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)},
> > +       [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, 0x0105)},
> >         { }
> >  };
> >
> > @@ -2232,7 +2234,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
> >                 } },
> >                 }
> >         },
> > -       .num_device_descs = 3,
> > +       .num_device_descs = 4,
> >         .devices = {
> >                 { "TechnoTrend TT-connect S2-4600",
> >                         { &dw2102_table[TECHNOTREND_S2_4600], NULL },
> > @@ -2246,6 +2248,10 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
> >                         { &dw2102_table[TEVII_S482_2], NULL },
> >                         { NULL },
> >                 },
> > +               { "Terratec Cinergy S2 USB BOX",
> > +                       { &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL },
> > +                       { NULL },
> > +               },
> >         }
> >  };
> >
> > --
> > 2.6.2
> >  


-- 
Thanks,
Mauro

Re: [PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Mauro Carvalho Chehab]

Em Mon, 18 Jul 2016 07:49:49 +0200
Olli Salonen <olli.salonen@iki.fi> escreveu:

> Hi Mauro,
> 
> I have a feeling that this device equals DVBSky S960 (driver
> dvb-usb-dvbsky) which might be equal to TechnoTrend S2-4600 (driver
> dvb-usb-dw2102).
> 
> If so, I think it would be good to move all devices to the dvbsky driver as
> that's dvb-usb-v2 unlike the dw2102 driver. I've got the S2-4600 myself, so
> I can take a look at that later on when not travelling.

If the driver is identical, then yeah, the best is to move everything
to the one based on dvb-usb-v2. I would really love to get rid of the
old dvb-usb driver, but, unfortunately, I don't have all devices.

I may try to port dib0700 some day, as this is likely the most complex
one, and may require some adjustments at dvb-usb-v2 that only the
dibcom drivers are currently using.

With regards to Terratec Cinergy S2 USB BOX, let's remove it from one
of the drivers. Could someone send me a patch doing that? It would be
nice if both Philipp and Benjamin test such patch, for us to be sure
that it would work for both.

Regards,
Mauro

> 
> Cheers,
> -olli
> 
> On 16 July 2016 at 18:47, Mauro Carvalho Chehab <mchehab@osg.samsung.com>
> wrote:
> 
> > Em Sat, 16 Jul 2016 18:26:35 +0200
> > Olli Salonen <olli.salonen@iki.fi> escreveu:
> >  
> > > Hi guys,
> > >
> > > It seems Philipp added the support for this device in dw2102 driver
> > > and Benjamin did that for the dvbsky driver a bit earlier.
> > >
> > > # grep -i 0ccdp0105 /lib/modules/$(uname -r)/modules.alias
> > > alias usb:v0CCDp0105d*dc*dsc*dp*ic*isc*ip*in* dvb_usb_dvbsky
> > > alias usb:v0CCDp0105d*dc*dsc*dp*ic*isc*ip*in* dvb_usb_dw2102
> > >
> > > Any suggestions on how to resolve this conflict?  
> >
> > Let me understand something: the same chipset is supported by both
> > modules? Or the device at dvbsky uses a different hardware than
> > the one at dw2102? In the latter case, sometimes it is possible
> > to distinguish the hardware based on the USB release info. We have
> > a few cases like that. One that comes on my mind is a pixelview
> > device, that uses the same ID for two different devices:
> >
> > cx231xx:
> >
> > {USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000,
> > 0x4001),
> >          .driver_info = CX231XX_BOARD_PV_PLAYTV_USB_HYBRID},
> >
> > dib0700:
> >
> >     { USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x000,
> > 0x3f00) },
> >
> > Regards,
> > Mauro
> >
> >
> >  
> > >
> > > Cheers,
> > > -olli
> > >
> > > On 4 January 2016 at 20:32, Philipp Zabel <p.zabel@pengutronix.de>  
> > wrote:  
> > > > The Terratec Cinergy S2 USB BOX uses a Montage M88TS2022 tuner
> > > > and a M88DS3103 demodulator, same as Technotrend TT-connect S2-4600.
> > > > This patch adds the missing USB Product ID to make it work.
> > > >
> > > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > > > ---
> > > >  drivers/media/usb/dvb-usb/dw2102.c | 8 +++++++-
> > > >  1 file changed, 7 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/media/usb/dvb-usb/dw2102.c  
> > b/drivers/media/usb/dvb-usb/dw2102.c  
> > > > index 14ef25d..9d18801 100644
> > > > --- a/drivers/media/usb/dvb-usb/dw2102.c
> > > > +++ b/drivers/media/usb/dvb-usb/dw2102.c
> > > > @@ -1688,6 +1688,7 @@ enum dw2102_table_entry {
> > > >         TECHNOTREND_S2_4600,
> > > >         TEVII_S482_1,
> > > >         TEVII_S482_2,
> > > > +       TERRATEC_CINERGY_S2_BOX,
> > > >  };
> > > >
> > > >  static struct usb_device_id dw2102_table[] = {
> > > > @@ -1715,6 +1716,7 @@ static struct usb_device_id dw2102_table[] = {
> > > >                 USB_PID_TECHNOTREND_CONNECT_S2_4600)},
> > > >         [TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)},
> > > >         [TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)},
> > > > +       [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC,  
> > 0x0105)},  
> > > >         { }
> > > >  };
> > > >
> > > > @@ -2232,7 +2234,7 @@ static struct dvb_usb_device_properties  
> > tt_s2_4600_properties = {  
> > > >                 } },
> > > >                 }
> > > >         },
> > > > -       .num_device_descs = 3,
> > > > +       .num_device_descs = 4,
> > > >         .devices = {
> > > >                 { "TechnoTrend TT-connect S2-4600",
> > > >                         { &dw2102_table[TECHNOTREND_S2_4600], NULL },
> > > > @@ -2246,6 +2248,10 @@ static struct dvb_usb_device_properties  
> > tt_s2_4600_properties = {  
> > > >                         { &dw2102_table[TEVII_S482_2], NULL },
> > > >                         { NULL },
> > > >                 },
> > > > +               { "Terratec Cinergy S2 USB BOX",
> > > > +                       { &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL  
> > },  
> > > > +                       { NULL },
> > > > +               },
> > > >         }
> > > >  };
> > > >
> > > > --
> > > > 2.6.2
> > > >  
> >
> >
> > --
> > Thanks,
> > Mauro
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-media" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >  


-- 
Thanks,
Mauro

Re: [PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Philipp Zabel]

Am Montag, den 18.07.2016, 08:59 -0300 schrieb Mauro Carvalho Chehab:
> Em Mon, 18 Jul 2016 07:49:49 +0200
> Olli Salonen <olli.salonen@iki.fi> escreveu:
> 
> > Hi Mauro,
> > 
> > I have a feeling that this device equals DVBSky S960 (driver
> > dvb-usb-dvbsky) which might be equal to TechnoTrend S2-4600 (driver
> > dvb-usb-dw2102).
> > 
> > If so, I think it would be good to move all devices to the dvbsky driver as
> > that's dvb-usb-v2 unlike the dw2102 driver. I've got the S2-4600 myself, so
> > I can take a look at that later on when not travelling.
> 
> If the driver is identical, then yeah, the best is to move everything
> to the one based on dvb-usb-v2. I would really love to get rid of the
> old dvb-usb driver, but, unfortunately, I don't have all devices.
> 
> I may try to port dib0700 some day, as this is likely the most complex
> one, and may require some adjustments at dvb-usb-v2 that only the
> dibcom drivers are currently using.
> 
> With regards to Terratec Cinergy S2 USB BOX, let's remove it from one
> of the drivers. Could someone send me a patch doing that? It would be
> nice if both Philipp and Benjamin test such patch, for us to be sure
> that it would work for both.

I'll test dvbsky next time I have access to the device.

regards
Philipp

Re: [PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Benjamin Larsson]

On 07/18/2016 01:59 PM, Mauro Carvalho Chehab wrote:
>It would be
> nice if both Philipp and Benjamin test such patch, for us to be sure
> that it would work for both.
>
> Regards,
> Mauro

I added it to the dvbsky driver so I guess that Philipp has to do the 
testing.

MvH
Benjamin Larsson

Re: [PATCH] [media] dw2102: Add support for Terratec Cinergy S2 USB BOX

[Philipp Zabel]

Am Mittwoch, den 27.07.2016, 17:34 +0200 schrieb Benjamin Larsson:
> On 07/18/2016 01:59 PM, Mauro Carvalho Chehab wrote:
> >It would be
> > nice if both Philipp and Benjamin test such patch, for us to be sure
> > that it would work for both.
> >
> > Regards,
> > Mauro
> 
> I added it to the dvbsky driver so I guess that Philipp has to do the 
> testing.

I have tested the dvbsky driver on v4.8-rc3 last weekend, and can
confirm that it works with the hardware in question.

regards
Philipp