linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 2/1] dvbsky: add support for "Mygica T230C v2"
@ 2019-07-08 22:41 Jan Pieter van Woerkom
  2019-07-08 22:46 ` [PATCH v4 2/2] " Jan Pieter van Woerkom
  2019-07-09 16:37 ` [PATCH v4 2/1] " JP
  0 siblings, 2 replies; 3+ messages in thread
From: Jan Pieter van Woerkom @ 2019-07-08 22:41 UTC (permalink / raw)
  To: linux-media
  Cc: Michael Ira Krufky, Antti Palosaari, Sean Young,
	Frantisek Rysanek, Jan Pieter van Woerkom

From: Jan Pieter van Woerkom <jp@jpvw.nl>

Adds support for the "Mygica T230C v2" into the "dvbsky" driver.
A small enhancement is also needed in the si2168 demodulator
driver, and a USB device ID in dvb-usb-ids.h .

This is v4 of the proposed patch, based on feedback from Sean
Young and Antti Palosaari.
Tested by patch author: can tune into DVB-(T/T2/C) muxes, AV
playback & data all work.
Tested by Frank Rysanek: can tune into locally available DVB-T
and DVB-T2 muxes, video and audio playback works.
Applies cleanly against Linux 5.1.* .

The T230C v2 hardware needs a mode of the si2168 chip to be set
for which the si2168 driver previously had no support. This patch
uses a specific measure to configure this on the T230C v2 hardware
only - see the flag passed via the  ts_clk_special attribute and
its dependency on USB_PID_MYGICA_T230C2. Other devices using the
si2168 demodulator driver are not affected in any way.

Signed-off-by: Jan Pieter van Woerkom <jp@jpvw.nl>
Tested-by: Frank Rysanek <Frantisek.Rysanek@post.cz>
---
diff -ru a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
--- a/drivers/media/dvb-frontends/si2168.c	2019-07-03 13:13:45.000000000 +0200
+++ b/drivers/media/dvb-frontends/si2168.c	2019-07-07 23:33:06.186303149 +0200
@@ -91,8 +91,20 @@
 
 	dev_dbg(&client->dev, "%s acquire: %d\n", __func__, acquire);
 
+	/* set ts clock freq to 10Mhz */
+	if (dev->ts_clk_special) {
+		memcpy(cmd.args, "\x14\x00\x0d\x10\xe8\x03", 6);
+		cmd.wlen = 6;
+		cmd.rlen = 4;
+		ret = si2168_cmd_execute(client, &cmd);
+		if (ret)
+			return ret;
+	}
+
 	/* set TS_MODE property */
 	memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
+	if (dev->ts_clk_special)
+		cmd.args[4] = 0x20;
 	if (acquire)
 		cmd.args[4] |= dev->ts_mode;
 	else
@@ -804,6 +816,7 @@
 	*config->i2c_adapter = dev->muxc->adapter[0];
 	*config->fe = &dev->fe;
 	dev->ts_mode = config->ts_mode;
+	dev->ts_clk_special = config->ts_clk_special;
 	dev->ts_clock_inv = config->ts_clock_inv;
 	dev->ts_clock_gapped = config->ts_clock_gapped;
 	dev->spectral_inversion = config->spectral_inversion;
diff -ru a/drivers/media/dvb-frontends/si2168.h b/drivers/media/dvb-frontends/si2168.h
--- a/drivers/media/dvb-frontends/si2168.h	2019-07-03 13:13:45.000000000 +0200
+++ b/drivers/media/dvb-frontends/si2168.h	2019-07-07 23:35:27.111462066 +0200
@@ -40,6 +40,7 @@
 #define SI2168_TS_SERIAL	0x03
 #define SI2168_TS_TRISTATE	0x00
 	u8 ts_mode;
+	bool ts_clk_special;
 
 	/* TS clock inverted */
 	bool ts_clock_inv;
diff -ru a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
--- a/drivers/media/dvb-frontends/si2168_priv.h	2019-07-03 13:13:45.000000000 +0200
+++ b/drivers/media/dvb-frontends/si2168_priv.h	2019-07-07 23:36:34.726130136 +0200
@@ -46,6 +46,7 @@
 	bool active;
 	bool warm;
 	u8 ts_mode;
+	bool ts_clk_special;
 	bool ts_clock_inv;
 	bool ts_clock_gapped;
 	bool spectral_inversion;

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH v4 2/2] dvbsky: add support for "Mygica T230C v2"
  2019-07-08 22:41 [PATCH v4 2/1] dvbsky: add support for "Mygica T230C v2" Jan Pieter van Woerkom
@ 2019-07-08 22:46 ` Jan Pieter van Woerkom
  2019-07-09 16:37 ` [PATCH v4 2/1] " JP
  1 sibling, 0 replies; 3+ messages in thread
From: Jan Pieter van Woerkom @ 2019-07-08 22:46 UTC (permalink / raw)
  To: linux-media
  Cc: Michael Ira Krufky, Antti Palosaari, Sean Young,
	Frantisek Rysanek, Jan Pieter van Woerkom

From: Jan Pieter van Woerkom <jp@jpvw.nl>

Adds support for the "Mygica T230C v2" into the "dvbsky" driver.

Signed-off-by: Jan Pieter van Woerkom <jp@jpvw.nl>
Tested-by: Frank Rysanek <Frantisek.Rysanek@post.cz>
---
diff -ru a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c	2019-07-03 13:13:45.000000000 +0200
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c	2019-07-07 23:40:06.450035907 +0200
@@ -560,6 +560,8 @@
 	si2168_config.i2c_adapter = &i2c_adapter;
 	si2168_config.fe = &adap->fe[0];
 	si2168_config.ts_mode = SI2168_TS_PARALLEL;
+	if (le16_to_cpu(d->udev->descriptor.idProduct) == USB_PID_MYGICA_T230C2)
+		si2168_config.ts_clk_special = 1;
 	si2168_config.ts_clock_inv = 1;
 
 	state->i2c_client_demod = dvb_module_probe("si2168", NULL,
@@ -799,6 +801,9 @@
 	{ DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C,
 		&mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C",
 		RC_MAP_TOTAL_MEDIA_IN_HAND_02) },
+	{ DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C2,
+		&mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C v2",
+		RC_MAP_TOTAL_MEDIA_IN_HAND_02) },
 	{ }
 };
 MODULE_DEVICE_TABLE(usb, dvbsky_id_table);
diff -ru a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h
--- a/include/media/dvb-usb-ids.h	2019-07-03 13:13:45.000000000 +0200
+++ b/include/media/dvb-usb-ids.h	2019-07-07 20:34:57.491309334 +0200
@@ -387,6 +387,7 @@
 #define USB_PID_MYGICA_D689				0xd811
 #define USB_PID_MYGICA_T230				0xc688
 #define USB_PID_MYGICA_T230C				0xc689
+#define USB_PID_MYGICA_T230C2				0xc68a
 #define USB_PID_ELGATO_EYETV_DIVERSITY			0x0011
 #define USB_PID_ELGATO_EYETV_DTT			0x0021
 #define USB_PID_ELGATO_EYETV_DTT_2			0x003f

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH v4 2/1] dvbsky: add support for "Mygica T230C v2"
  2019-07-08 22:41 [PATCH v4 2/1] dvbsky: add support for "Mygica T230C v2" Jan Pieter van Woerkom
  2019-07-08 22:46 ` [PATCH v4 2/2] " Jan Pieter van Woerkom
@ 2019-07-09 16:37 ` JP
  1 sibling, 0 replies; 3+ messages in thread
From: JP @ 2019-07-09 16:37 UTC (permalink / raw)
  To: linux-media
  Cc: Michael Ira Krufky, Antti Palosaari, Sean Young, Frantisek Rysanek

Hi all,

I noticed an issue on linux-5.2. Do not merge this!
Forget about this v4 patch. I'll do more tests with v3.*, and
then repost.

Cheers,

Jan Pieter.


On 7/9/19 12:41 AM, Jan Pieter van Woerkom wrote:
> From: Jan Pieter van Woerkom <jp@jpvw.nl>
>
> Adds support for the "Mygica T230C v2" into the "dvbsky" driver.
> A small enhancement is also needed in the si2168 demodulator
> driver, and a USB device ID in dvb-usb-ids.h .
>
> This is v4 of the proposed patch, based on feedback from Sean
> Young and Antti Palosaari.
> Tested by patch author: can tune into DVB-(T/T2/C) muxes, AV
> playback & data all work.
> Tested by Frank Rysanek: can tune into locally available DVB-T
> and DVB-T2 muxes, video and audio playback works.
> Applies cleanly against Linux 5.1.* .
>
> The T230C v2 hardware needs a mode of the si2168 chip to be set
> for which the si2168 driver previously had no support. This patch
> uses a specific measure to configure this on the T230C v2 hardware
> only - see the flag passed via the  ts_clk_special attribute and
> its dependency on USB_PID_MYGICA_T230C2. Other devices using the
> si2168 demodulator driver are not affected in any way.
>
> Signed-off-by: Jan Pieter van Woerkom <jp@jpvw.nl>
> Tested-by: Frank Rysanek <Frantisek.Rysanek@post.cz>
> ---
> diff -ru a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
> --- a/drivers/media/dvb-frontends/si2168.c	2019-07-03 13:13:45.000000000 +0200
> +++ b/drivers/media/dvb-frontends/si2168.c	2019-07-07 23:33:06.186303149 +0200
> @@ -91,8 +91,20 @@
>   
>   	dev_dbg(&client->dev, "%s acquire: %d\n", __func__, acquire);
>   
> +	/* set ts clock freq to 10Mhz */
> +	if (dev->ts_clk_special) {
> +		memcpy(cmd.args, "\x14\x00\x0d\x10\xe8\x03", 6);
> +		cmd.wlen = 6;
> +		cmd.rlen = 4;
> +		ret = si2168_cmd_execute(client, &cmd);
> +		if (ret)
> +			return ret;
> +	}
> +
>   	/* set TS_MODE property */
>   	memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
> +	if (dev->ts_clk_special)
> +		cmd.args[4] = 0x20;
>   	if (acquire)
>   		cmd.args[4] |= dev->ts_mode;
>   	else
> @@ -804,6 +816,7 @@
>   	*config->i2c_adapter = dev->muxc->adapter[0];
>   	*config->fe = &dev->fe;
>   	dev->ts_mode = config->ts_mode;
> +	dev->ts_clk_special = config->ts_clk_special;
>   	dev->ts_clock_inv = config->ts_clock_inv;
>   	dev->ts_clock_gapped = config->ts_clock_gapped;
>   	dev->spectral_inversion = config->spectral_inversion;
> diff -ru a/drivers/media/dvb-frontends/si2168.h b/drivers/media/dvb-frontends/si2168.h
> --- a/drivers/media/dvb-frontends/si2168.h	2019-07-03 13:13:45.000000000 +0200
> +++ b/drivers/media/dvb-frontends/si2168.h	2019-07-07 23:35:27.111462066 +0200
> @@ -40,6 +40,7 @@
>   #define SI2168_TS_SERIAL	0x03
>   #define SI2168_TS_TRISTATE	0x00
>   	u8 ts_mode;
> +	bool ts_clk_special;
>   
>   	/* TS clock inverted */
>   	bool ts_clock_inv;
> diff -ru a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
> --- a/drivers/media/dvb-frontends/si2168_priv.h	2019-07-03 13:13:45.000000000 +0200
> +++ b/drivers/media/dvb-frontends/si2168_priv.h	2019-07-07 23:36:34.726130136 +0200
> @@ -46,6 +46,7 @@
>   	bool active;
>   	bool warm;
>   	u8 ts_mode;
> +	bool ts_clk_special;
>   	bool ts_clock_inv;
>   	bool ts_clock_gapped;
>   	bool spectral_inversion;
>


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-09 16:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-08 22:41 [PATCH v4 2/1] dvbsky: add support for "Mygica T230C v2" Jan Pieter van Woerkom
2019-07-08 22:46 ` [PATCH v4 2/2] " Jan Pieter van Woerkom
2019-07-09 16:37 ` [PATCH v4 2/1] " JP

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).