linux-media: dvbsky: add support for Mygica T230C v2
Subsystems (2)
cover linux-media: dvbsky: add support for Mygica T230C v2
Add support for the "Mygica T230C v2" into the "dvbsky" driver. A small enhancement in the si2168 demodulator driver is also needed, and a USB device ID in dvb-usb-ids.h .
This is v3.6 of proposed patch, based on work from an anonymous author, and with feedback from Sean Young and Antti Palosaari. Tested by patch author on DVB-(T/T2/C). 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.2 .
Adds support for the "Mygica T230C v2" into the "dvbsky" driver.
---
drivers/media/usb/dvb-usb-v2/dvbsky.c +5 -0
@@ -551,6 +551,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_mode |=SI2168_TS_CLK_MANUAL ; si2168_config.ts_clock_inv =1 ; state->i2c_client_demod = dvb_module_probe("si2168", NULL,
@@ -790,6 +792,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);
include/media/dvb-usb-ids.h +1 -0
@@ -388,6 +388,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
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_mode attribute and its dependency on USB_PID_MYGICA_T230C2.
---
drivers/media/dvb-frontends/si2168.c +10 -0
@@ -82,8 +82,18 @@dev_dbg (&client->dev,"%s acquire: %d\n" , __func__, acquire); +/* set manual value */ +if (dev->ts_mode &SI2168_TS_CLK_MANUAL ) { +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 ); + cmd.args[4 ] <<= (dev->ts_mode &SI2168_TS_CLK_MANUAL ) >>5 ;if (acquire) cmd.args[4 ] |= dev->ts_mode;else
drivers/media/dvb-frontends/si2168.h +1 -0
@@ -30,6 +30,7 @@#define SI2168_TS_PARALLEL 0x06#define SI2168_TS_SERIAL 0x03#define SI2168_TS_TRISTATE 0x00 +#define SI2168_TS_CLK_MANUAL 0x20u8 ts_mode;/* TS clock inverted */
Quoted 18 lines · Jan Pieter van Woerkom
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_modeattribute and its dependency onUSB_PID_MYGICA_T230C2.Signed-off-by Jan Pieter van Woerkom <[email protected]>Tested-by Frank Rysanek <[email protected]>---
diff -rua/drivers/media/dvb-frontends/si2168.cb/drivers/media/dvb-frontends/si2168.cdrivers/media/dvb-frontends/si2168.c +2
-0@@ -82,8 +82,18 @@dev_dbg (&client->dev,"%s acquire: %d\n" , __func__, acquire); +/* set manual value */ +if (dev->ts_mode &SI2168_TS_CLK_MANUAL ) {
drivers/media/dvb-frontends/si2168.c line 96
Quoted 10 lines
drivers/media/dvb-frontends/si2168.c +8
-0+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 ); + cmd.args[4 ] <<= (dev->ts_mode &SI2168_TS_CLK_MANUAL ) >>5 ;
I'm sorry but this is not very readable. How about:
if (dev->ts_mode & SI2168_TS_CLK_MANUAL) cmd.args[4] = SI2168_TS_CLK_MANUAL;
?
Sean
Quoted 14 lines
drivers/media/dvb-frontends/si2168.c +0
-0if (acquire) cmd.args[4 ] |= dev->ts_mode;else diff -ru
a/drivers/media/dvb-frontends/si2168.hb/drivers/media/dvb-frontends/si2168.hdrivers/media/dvb-frontends/si2168.h +1
-0@@ -30,6 +30,7 @@#define SI2168_TS_PARALLEL 0x06#define SI2168_TS_SERIAL 0x03#define SI2168_TS_TRISTATE 0x00 +#define SI2168_TS_CLK_MANUAL 0x20u8 ts_mode;/* TS clock inverted */
Quoted 31 lines · Sean Young
Quoted 18 lines · Jan Pieter van Woerkom
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_modeattribute and its dependency onUSB_PID_MYGICA_T230C2.Signed-off-by Jan Pieter van Woerkom <[email protected]>Tested-by Frank Rysanek <[email protected]>---
diff -rua/drivers/media/dvb-frontends/si2168.cb/drivers/media/dvb-frontends/si2168.cdrivers/media/dvb-frontends/si2168.c +2
-0@@ -82,8 +82,18 @@dev_dbg (&client->dev,"%s acquire: %d\n" , __func__, acquire); +/* set manual value */ +if (dev->ts_mode &SI2168_TS_CLK_MANUAL ) {drivers/media/dvb-frontends/si2168.c line 96
Quoted 10 lines
drivers/media/dvb-frontends/si2168.c +8
-0+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 ); + cmd.args[4 ] <<= (dev->ts_mode &SI2168_TS_CLK_MANUAL ) >>5 ;I'm sorry but this is not very readable. How about:
Quoted 4 lines
if (dev->ts_mode & SI2168_TS_CLK_MANUAL) cmd.args[4] = SI2168_TS_CLK_MANUAL;?
Yes you're right. I'll post update in this thread.
Quoted 17 lines
Sean
Quoted 14 lines
drivers/media/dvb-frontends/si2168.c +0
-0if (acquire) cmd.args[4 ] |= dev->ts_mode;else diff -ru
a/drivers/media/dvb-frontends/si2168.hb/drivers/media/dvb-frontends/si2168.hdrivers/media/dvb-frontends/si2168.h +1
-0@@ -30,6 +30,7 @@#define SI2168_TS_PARALLEL 0x06#define SI2168_TS_SERIAL 0x03#define SI2168_TS_TRISTATE 0x00 +#define SI2168_TS_CLK_MANUAL 0x20u8 ts_mode;/* TS clock inverted */
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_mode attribute and its dependency on USB_PID_MYGICA_T230C2.
---
drivers/media/dvb-frontends/si2168.c +11 -0
@@ -82,8 +82,19 @@dev_dbg (&client->dev,"%s acquire: %d\n" , __func__, acquire); +/* set manual value */ +if (dev->ts_mode &SI2168_TS_CLK_MANUAL ) { +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_mode &SI2168_TS_CLK_MANUAL ) + cmd.args[4 ] =SI2168_TS_CLK_MANUAL ;if (acquire) cmd.args[4 ] |= dev->ts_mode;else
drivers/media/dvb-frontends/si2168.h +1 -0
@@ -30,6 +30,7 @@#define SI2168_TS_PARALLEL 0x06#define SI2168_TS_SERIAL 0x03#define SI2168_TS_TRISTATE 0x00 +#define SI2168_TS_CLK_MANUAL 0x20u8 ts_mode;/* TS clock inverted */