Add new dvb-t board ":Zolid Hybrid Tv Stick"

PATCH In review mjs 2 participants 8 messages Apr 25, 2018 – Apr 26, 2018 Media (V4L/DVB)

Share & tools

mjs

author

2018-04-25 09:09 UTC #0 lore raw

PATCH 1/1 Add new dvb-t board ":Zolid Hybrid Tv Stick"

From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".

Extra code to be able to use this stick, only digital, not analog nor remote-control.

Changes to be committed:

	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h

---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

em28xx-cards.c +29 -1

index 6e0e67d..01b38a4 100644
@@ -87,6 +87,21 @@ static const struct em28xx_reg_seq default_digital[] = {
 	{	-1,		-1,	-1,		-1},
 };
 
+/* Board Zolid Hybrid Tv Stick */
+static struct em28xx_reg_seq zolid_tuner[] = {
+	{EM2820_R08_GPIO_CTRL,		0xfd,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0xfe,		0xff,	100},
+	{		-1,					-1,			-1,		 -1},
+};
+
+static struct em28xx_reg_seq zolid_digital[] = {
+	{EM2820_R08_GPIO_CTRL,		0x6a,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0x7a,		0xff,	100},
+	{EM2880_R04_GPO,			0x04,		0xff,	100},
+	{EM2880_R04_GPO,			0x0c,		0xff,	100},
+	{	-1,						-1,			-1,		 -1},
+};
+
 /* Board Hauppauge WinTV HVR 900 analog */
 static const struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
 	{EM2820_R08_GPIO_CTRL,	0x2d,	~EM_GPIO_4,	10},

@@ -679,6 +694,16 @@ const struct em28xx_board em28xx_boards[] = {
 			.amux     = EM28XX_AMUX_VIDEO,
 		} },
 	},
+	[EM2882_BOARD_ZOLID_HYBRID_TV_STICK] = {
+		.name			= ":ZOLID HYBRID TV STICK",
+		.tuner_type		= TUNER_XC2028,
+		.tuner_gpio		= zolid_tuner,
+		.decoder		= EM28XX_TVP5150,
+		.xclk			= EM28XX_XCLK_FREQUENCY_12MHZ,
+		.mts_firmware	= 1,
+		.has_dvb		= 1,
+		.dvb_gpio		= zolid_digital,
+	},
 	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {
 		.name         = "Kworld PVR TV 2800 RF",
 		.tuner_type   = TUNER_TEMIC_PAL,

@@ -2493,7 +2518,7 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2881),
 			.driver_info = EM2820_BOARD_UNKNOWN },
-	{ USB_DEVICE(0xeb1a, 0x2883),
+	{ USB_DEVICE(0xeb1a, 0x2883), /* used by zolid hybrid tv stick */
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2868),
 			.driver_info = EM2820_BOARD_UNKNOWN },

@@ -2688,6 +2713,7 @@ static const struct em28xx_hash_table em28xx_eeprom_hash[] = {
 	{0xb8846b20, EM2881_BOARD_PINNACLE_HYBRID_PRO, TUNER_XC2028},
 	{0x63f653bd, EM2870_BOARD_REDDO_DVB_C_USB_BOX, TUNER_ABSENT},
 	{0x4e913442, EM2882_BOARD_DIKOM_DK300, TUNER_XC2028},
+	{0x85dd871e, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */

@@ -2699,6 +2725,7 @@ static const struct em28xx_hash_table em28xx_i2c_hash[] = {
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 	{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
+	{0x27e10080, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */

@@ -3187,6 +3214,7 @@ void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 	case EM2880_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
 	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		ctl->demod = XC3028_FE_ZARLINK456;
 		break;
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

em28xx-dvb.c +1 -0

index ebe62ff..640eafe 100644
@@ -1488,6 +1488,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
 	case EM2882_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_EMPIRE_DUAL_TV:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		dvb->fe[0] = dvb_attach(zl10353_attach,
 					&em28xx_zl10353_xc3028_no_i2c_gate,
 					&dev->i2c_adap[dev->def_i2c_bus]);

em28xx.h +1 -0

index 5fc70d9..37bb696 100644
@@ -146,6 +146,7 @@
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB  99
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
 #define EM2884_BOARD_TERRATEC_H6		  101
+#define EM2882_BOARD_ZOLID_HYBRID_TV_STICK		102
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4

Signature · 1 line

2.11.0

Mauro Carvalho Chehab

2018-04-25 09:16 UTC #1 lore raw

Em Wed, 25 Apr 2018 11:09:50 +0200
mjs <[email protected]> escreveu:

Quoted 11 lines

From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".
Extra code to be able to use this stick, only digital, not analog nor remote-control.
Changes to be committed:
	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h

You forgot to add your Signed-off-by. That's mandatory for patches to be acepted.

Quoted 6 lines

---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

use git diff against upstream tree. This should be using a different paths there, e.g. drivers/media/usb/em28xx/...

Quoted 94 lines

em28xx-cards.c +29 -1

index 6e0e67d..01b38a4 100644
@@ -87,6 +87,21 @@ static const struct em28xx_reg_seq default_digital[] = {
 	{	-1,		-1,	-1,		-1},
 };
 
+/* Board Zolid Hybrid Tv Stick */
+static struct em28xx_reg_seq zolid_tuner[] = {
+	{EM2820_R08_GPIO_CTRL,		0xfd,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0xfe,		0xff,	100},
+	{		-1,					-1,			-1,		 -1},
+};
+
+static struct em28xx_reg_seq zolid_digital[] = {
+	{EM2820_R08_GPIO_CTRL,		0x6a,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0x7a,		0xff,	100},
+	{EM2880_R04_GPO,			0x04,		0xff,	100},
+	{EM2880_R04_GPO,			0x0c,		0xff,	100},
+	{	-1,						-1,			-1,		 -1},
+};
+
 /* Board Hauppauge WinTV HVR 900 analog */
 static const struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
 	{EM2820_R08_GPIO_CTRL,	0x2d,	~EM_GPIO_4,	10},

@@ -679,6 +694,16 @@ const struct em28xx_board em28xx_boards[] = {
 			.amux     = EM28XX_AMUX_VIDEO,
 		} },
 	},
+	[EM2882_BOARD_ZOLID_HYBRID_TV_STICK] = {
+		.name			= ":ZOLID HYBRID TV STICK",
+		.tuner_type		= TUNER_XC2028,
+		.tuner_gpio		= zolid_tuner,
+		.decoder		= EM28XX_TVP5150,
+		.xclk			= EM28XX_XCLK_FREQUENCY_12MHZ,
+		.mts_firmware	= 1,
+		.has_dvb		= 1,
+		.dvb_gpio		= zolid_digital,
+	},
 	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {
 		.name         = "Kworld PVR TV 2800 RF",
 		.tuner_type   = TUNER_TEMIC_PAL,

@@ -2493,7 +2518,7 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2881),
 			.driver_info = EM2820_BOARD_UNKNOWN },
-	{ USB_DEVICE(0xeb1a, 0x2883),
+	{ USB_DEVICE(0xeb1a, 0x2883), /* used by zolid hybrid tv stick */
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2868),
 			.driver_info = EM2820_BOARD_UNKNOWN },

@@ -2688,6 +2713,7 @@ static const struct em28xx_hash_table em28xx_eeprom_hash[] = {
 	{0xb8846b20, EM2881_BOARD_PINNACLE_HYBRID_PRO, TUNER_XC2028},
 	{0x63f653bd, EM2870_BOARD_REDDO_DVB_C_USB_BOX, TUNER_ABSENT},
 	{0x4e913442, EM2882_BOARD_DIKOM_DK300, TUNER_XC2028},
+	{0x85dd871e, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */

@@ -2699,6 +2725,7 @@ static const struct em28xx_hash_table em28xx_i2c_hash[] = {
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 	{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
+	{0x27e10080, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */

@@ -3187,6 +3214,7 @@ void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 	case EM2880_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
 	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		ctl->demod = XC3028_FE_ZARLINK456;
 		break;
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

em28xx-dvb.c +1 -0

index ebe62ff..640eafe 100644
@@ -1488,6 +1488,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
 	case EM2882_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_EMPIRE_DUAL_TV:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		dvb->fe[0] = dvb_attach(zl10353_attach,
 					&em28xx_zl10353_xc3028_no_i2c_gate,
 					&dev->i2c_adap[dev->def_i2c_bus]);

em28xx.h +0 -0

index 5fc70d9..37bb696 100644

em28xx.h line 152

Quoted 7 lines

em28xx.h +1 -0

@@ -146,6 +146,7 @@
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB  99
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
 #define EM2884_BOARD_TERRATEC_H6		  101
+#define EM2882_BOARD_ZOLID_HYBRID_TV_STICK		102
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4

Thanks,
Mauro

mjs

author

2018-04-25 10:11 UTC #2 lore raw

Op Wed, 25 Apr 2018 06:16:20 -0300
Mauro Carvalho Chehab <[email protected]> schreef:

Quoted 10 lines

Em Wed, 25 Apr 2018 11:09:50 +0200
mjs <[email protected]> escreveu:
Quoted 7 lines
From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".
Extra code to be able to use this stick, only digital, not analog nor remote-control.

Quoted 7 lines

Quoted 4 lines
Changes to be committed:
	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h  
You forgot to add your Signed-off-by. That's mandatory for patches to be acepted.

Ok, still learning

Quoted 11 lines

Quoted 7 lines
---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)  
use git diff against upstream tree. This should be using a different paths there, e.g. drivers/media/usb/em28xx/...

This is actually against the upstream tree, in line with your advice in a previous mail.
After git clone... and ./build, I did not do "make install" but copy-paste out of the /media_build/linux/drivers/media/usb/em28xx Reason, I do not have an experimental pc and some parts are experimental.
I did not want to take the risk to crash my working pc at this moment in time.

I will try to work around this problem.

Quoted 100 lines

em28xx-cards.c +29 -1

index 6e0e67d..01b38a4 100644
@@ -87,6 +87,21 @@ static const struct em28xx_reg_seq default_digital[] = {
 	{	-1,		-1,	-1,		-1},
 };
 
+/* Board Zolid Hybrid Tv Stick */
+static struct em28xx_reg_seq zolid_tuner[] = {
+	{EM2820_R08_GPIO_CTRL,		0xfd,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0xfe,		0xff,	100},
+	{		-1,					-1,			-1,		 -1},
+};
+
+static struct em28xx_reg_seq zolid_digital[] = {
+	{EM2820_R08_GPIO_CTRL,		0x6a,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0x7a,		0xff,	100},
+	{EM2880_R04_GPO,			0x04,		0xff,	100},
+	{EM2880_R04_GPO,			0x0c,		0xff,	100},
+	{	-1,						-1,			-1,		 -1},
+};
+
 /* Board Hauppauge WinTV HVR 900 analog */
 static const struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
 	{EM2820_R08_GPIO_CTRL,	0x2d,	~EM_GPIO_4,	10},

@@ -679,6 +694,16 @@ const struct em28xx_board em28xx_boards[] = {
 			.amux     = EM28XX_AMUX_VIDEO,
 		} },
 	},
+	[EM2882_BOARD_ZOLID_HYBRID_TV_STICK] = {
+		.name			= ":ZOLID HYBRID TV STICK",
+		.tuner_type		= TUNER_XC2028,
+		.tuner_gpio		= zolid_tuner,
+		.decoder		= EM28XX_TVP5150,
+		.xclk			= EM28XX_XCLK_FREQUENCY_12MHZ,
+		.mts_firmware	= 1,
+		.has_dvb		= 1,
+		.dvb_gpio		= zolid_digital,
+	},
 	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {
 		.name         = "Kworld PVR TV 2800 RF",
 		.tuner_type   = TUNER_TEMIC_PAL,

@@ -2493,7 +2518,7 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2881),
 			.driver_info = EM2820_BOARD_UNKNOWN },
-	{ USB_DEVICE(0xeb1a, 0x2883),
+	{ USB_DEVICE(0xeb1a, 0x2883), /* used by zolid hybrid tv stick */
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2868),
 			.driver_info = EM2820_BOARD_UNKNOWN },

@@ -2688,6 +2713,7 @@ static const struct em28xx_hash_table em28xx_eeprom_hash[] = {
 	{0xb8846b20, EM2881_BOARD_PINNACLE_HYBRID_PRO, TUNER_XC2028},
 	{0x63f653bd, EM2870_BOARD_REDDO_DVB_C_USB_BOX, TUNER_ABSENT},
 	{0x4e913442, EM2882_BOARD_DIKOM_DK300, TUNER_XC2028},
+	{0x85dd871e, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */

@@ -2699,6 +2725,7 @@ static const struct em28xx_hash_table em28xx_i2c_hash[] = {
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 	{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
+	{0x27e10080, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */

@@ -3187,6 +3214,7 @@ void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 	case EM2880_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
 	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		ctl->demod = XC3028_FE_ZARLINK456;
 		break;
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

em28xx-dvb.c +1 -0

index ebe62ff..640eafe 100644
@@ -1488,6 +1488,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
 	case EM2882_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_EMPIRE_DUAL_TV:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		dvb->fe[0] = dvb_attach(zl10353_attach,
 					&em28xx_zl10353_xc3028_no_i2c_gate,
 					&dev->i2c_adap[dev->def_i2c_bus]);

em28xx.h +1 -0

index 5fc70d9..37bb696 100644
@@ -146,6 +146,7 @@
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB  99
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
 #define EM2884_BOARD_TERRATEC_H6		  101
+#define EM2882_BOARD_ZOLID_HYBRID_TV_STICK		102

Quoted 5 lines

em28xx.h line 152

Quoted 2 lines

em28xx.h +0 -0

 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4

Thanks,
Marcel

Mauro Carvalho Chehab

2018-04-25 11:18 UTC #3 lore raw

Em Wed, 25 Apr 2018 12:11:10 +0200
mjs <[email protected]> escreveu:

Quoted 35 lines

Op Wed, 25 Apr 2018 06:16:20 -0300
Mauro Carvalho Chehab <[email protected]> schreef:
Quoted 10 lines
Em Wed, 25 Apr 2018 11:09:50 +0200
mjs <[email protected]> escreveu:
Quoted 7 lines
From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".
Extra code to be able to use this stick, only digital, not analog nor remote-control.
Quoted 7 lines
Quoted 4 lines
Changes to be committed:
	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h    
You forgot to add your Signed-off-by. That's mandatory for patches to be acepted.
Ok, still learning
Quoted 11 lines
Quoted 7 lines
  

---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)    
use git diff against upstream tree. This should be using a different paths there, e.g. drivers/media/usb/em28xx/...

Quoted 6 lines

This is actually against the upstream tree, in line with your advice in a previous mail.
After git clone... and ./build, I did not do "make install" but copy-paste out of the /media_build/linux/drivers/media/usb/em28xx Reason, I do not have an experimental pc and some parts are experimental.
I did not want to take the risk to crash my working pc at this moment in time.
I will try to work around this problem.

Upstream is actually this tree:

https://git.linuxtv.org/media_tree.git/

The media_build tree is what we call a "backport tree" :-)

Quoted 102 lines

em28xx-cards.c +29 -1

index 6e0e67d..01b38a4 100644
@@ -87,6 +87,21 @@ static const struct em28xx_reg_seq default_digital[] = {
 	{	-1,		-1,	-1,		-1},
 };
 
+/* Board Zolid Hybrid Tv Stick */
+static struct em28xx_reg_seq zolid_tuner[] = {
+	{EM2820_R08_GPIO_CTRL,		0xfd,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0xfe,		0xff,	100},
+	{		-1,					-1,			-1,		 -1},
+};
+
+static struct em28xx_reg_seq zolid_digital[] = {
+	{EM2820_R08_GPIO_CTRL,		0x6a,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0x7a,		0xff,	100},
+	{EM2880_R04_GPO,			0x04,		0xff,	100},
+	{EM2880_R04_GPO,			0x0c,		0xff,	100},
+	{	-1,						-1,			-1,		 -1},
+};
+
 /* Board Hauppauge WinTV HVR 900 analog */
 static const struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
 	{EM2820_R08_GPIO_CTRL,	0x2d,	~EM_GPIO_4,	10},

@@ -679,6 +694,16 @@ const struct em28xx_board em28xx_boards[] = {
 			.amux     = EM28XX_AMUX_VIDEO,
 		} },
 	},
+	[EM2882_BOARD_ZOLID_HYBRID_TV_STICK] = {
+		.name			= ":ZOLID HYBRID TV STICK",
+		.tuner_type		= TUNER_XC2028,
+		.tuner_gpio		= zolid_tuner,
+		.decoder		= EM28XX_TVP5150,
+		.xclk			= EM28XX_XCLK_FREQUENCY_12MHZ,
+		.mts_firmware	= 1,
+		.has_dvb		= 1,
+		.dvb_gpio		= zolid_digital,
+	},
 	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {
 		.name         = "Kworld PVR TV 2800 RF",
 		.tuner_type   = TUNER_TEMIC_PAL,

@@ -2493,7 +2518,7 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2881),
 			.driver_info = EM2820_BOARD_UNKNOWN },
-	{ USB_DEVICE(0xeb1a, 0x2883),
+	{ USB_DEVICE(0xeb1a, 0x2883), /* used by zolid hybrid tv stick */
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2868),
 			.driver_info = EM2820_BOARD_UNKNOWN },

@@ -2688,6 +2713,7 @@ static const struct em28xx_hash_table em28xx_eeprom_hash[] = {
 	{0xb8846b20, EM2881_BOARD_PINNACLE_HYBRID_PRO, TUNER_XC2028},
 	{0x63f653bd, EM2870_BOARD_REDDO_DVB_C_USB_BOX, TUNER_ABSENT},
 	{0x4e913442, EM2882_BOARD_DIKOM_DK300, TUNER_XC2028},
+	{0x85dd871e, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */

@@ -2699,6 +2725,7 @@ static const struct em28xx_hash_table em28xx_i2c_hash[] = {
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 	{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
+	{0x27e10080, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */

@@ -3187,6 +3214,7 @@ void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 	case EM2880_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
 	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		ctl->demod = XC3028_FE_ZARLINK456;
 		break;
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

em28xx-dvb.c +1 -0

index ebe62ff..640eafe 100644
@@ -1488,6 +1488,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
 	case EM2882_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_EMPIRE_DUAL_TV:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		dvb->fe[0] = dvb_attach(zl10353_attach,
 					&em28xx_zl10353_xc3028_no_i2c_gate,
 					&dev->i2c_adap[dev->def_i2c_bus]);

em28xx.h +1 -0

index 5fc70d9..37bb696 100644
@@ -146,6 +146,7 @@
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB  99
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
 #define EM2884_BOARD_TERRATEC_H6		  101
+#define EM2882_BOARD_ZOLID_HYBRID_TV_STICK		102

Quoted 7 lines

Quoted 5 lines
em28xx.h line 152
Quoted 2 lines
em28xx.h +0 -0
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4    
Thanks,
Marcel

Thanks,
Mauro

mjs

author

2018-04-25 12:24 UTC #4 lore raw

Op Wed, 25 Apr 2018 08:18:55 -0300
Mauro Carvalho Chehab <[email protected]> schreef:

Quoted 43 lines

Em Wed, 25 Apr 2018 12:11:10 +0200
mjs <[email protected]> escreveu:
Quoted 40 lines
Op Wed, 25 Apr 2018 06:16:20 -0300
Mauro Carvalho Chehab <[email protected]> schreef:
Quoted 10 lines
Em Wed, 25 Apr 2018 11:09:50 +0200
mjs <[email protected]> escreveu:
Quoted 7 lines
From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".
Extra code to be able to use this stick, only digital, not analog nor remote-control.
Quoted 7 lines
Quoted 4 lines
Changes to be committed:
	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h      
You forgot to add your Signed-off-by. That's mandatory for patches to be acepted.
Ok, still learning
Quoted 11 lines
Quoted 7 lines
    

---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)      
use git diff against upstream tree. This should be using a different paths there, e.g. drivers/media/usb/em28xx/...
This is actually against the upstream tree, in line with your advice in a previous mail.
After git clone... and ./build, I did not do "make install" but copy-paste out of the /media_build/linux/drivers/media/usb/em28xx Reason, I do not have an experimental pc and some parts are experimental.
I did not want to take the risk to crash my working pc at this moment in time.

Quoted 7 lines

Quoted 1 line
I will try to work around this problem.
Upstream is actually this tree:
https://git.linuxtv.org/media_tree.git/
The media_build tree is what we call a "backport tree" :-)

I started with "https://linuxtv.org/wiki/index.php/Development:_How_to_submit_patches" in line with your advice in a previous mail. Followed the text to "https://linuxtv.org/wiki/index.php/How_to_Obtain,_Build_and_Install_V4L-DVB_Device Drivers" basic approach. Also to "https://git.linuxtv.org/media_build.git/about/"
I have used "git clone --depth=1 git://linuxtv.org/media_build.git" followed by ./build and copy/paste files mentioned above. This is not the required upstream tree ?

Work around:
Added the path to all files manually.
This is acceptable ?

Quoted 103 lines

em28xx-cards.c +29 -1

index 6e0e67d..01b38a4 100644
@@ -87,6 +87,21 @@ static const struct em28xx_reg_seq default_digital[] = {
 	{	-1,		-1,	-1,		-1},
 };
 
+/* Board Zolid Hybrid Tv Stick */
+static struct em28xx_reg_seq zolid_tuner[] = {
+	{EM2820_R08_GPIO_CTRL,		0xfd,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0xfe,		0xff,	100},
+	{		-1,					-1,			-1,		 -1},
+};
+
+static struct em28xx_reg_seq zolid_digital[] = {
+	{EM2820_R08_GPIO_CTRL,		0x6a,		0xff,	100},
+	{EM2820_R08_GPIO_CTRL,		0x7a,		0xff,	100},
+	{EM2880_R04_GPO,			0x04,		0xff,	100},
+	{EM2880_R04_GPO,			0x0c,		0xff,	100},
+	{	-1,						-1,			-1,		 -1},
+};
+
 /* Board Hauppauge WinTV HVR 900 analog */
 static const struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
 	{EM2820_R08_GPIO_CTRL,	0x2d,	~EM_GPIO_4,	10},

@@ -679,6 +694,16 @@ const struct em28xx_board em28xx_boards[] = {
 			.amux     = EM28XX_AMUX_VIDEO,
 		} },
 	},
+	[EM2882_BOARD_ZOLID_HYBRID_TV_STICK] = {
+		.name			= ":ZOLID HYBRID TV STICK",
+		.tuner_type		= TUNER_XC2028,
+		.tuner_gpio		= zolid_tuner,
+		.decoder		= EM28XX_TVP5150,
+		.xclk			= EM28XX_XCLK_FREQUENCY_12MHZ,
+		.mts_firmware	= 1,
+		.has_dvb		= 1,
+		.dvb_gpio		= zolid_digital,
+	},
 	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {
 		.name         = "Kworld PVR TV 2800 RF",
 		.tuner_type   = TUNER_TEMIC_PAL,

@@ -2493,7 +2518,7 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2881),
 			.driver_info = EM2820_BOARD_UNKNOWN },
-	{ USB_DEVICE(0xeb1a, 0x2883),
+	{ USB_DEVICE(0xeb1a, 0x2883), /* used by zolid hybrid tv stick */
 			.driver_info = EM2820_BOARD_UNKNOWN },
 	{ USB_DEVICE(0xeb1a, 0x2868),
 			.driver_info = EM2820_BOARD_UNKNOWN },

@@ -2688,6 +2713,7 @@ static const struct em28xx_hash_table em28xx_eeprom_hash[] = {
 	{0xb8846b20, EM2881_BOARD_PINNACLE_HYBRID_PRO, TUNER_XC2028},
 	{0x63f653bd, EM2870_BOARD_REDDO_DVB_C_USB_BOX, TUNER_ABSENT},
 	{0x4e913442, EM2882_BOARD_DIKOM_DK300, TUNER_XC2028},
+	{0x85dd871e, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */

@@ -2699,6 +2725,7 @@ static const struct em28xx_hash_table em28xx_i2c_hash[] = {
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 	{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
+	{0x27e10080, EM2882_BOARD_ZOLID_HYBRID_TV_STICK, TUNER_XC2028},
 };
 
 /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */

@@ -3187,6 +3214,7 @@ void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 	case EM2880_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
 	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		ctl->demod = XC3028_FE_ZARLINK456;
 		break;
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

em28xx-dvb.c +1 -0

index ebe62ff..640eafe 100644
@@ -1488,6 +1488,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
 	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
 	case EM2882_BOARD_TERRATEC_HYBRID_XS:
 	case EM2880_BOARD_EMPIRE_DUAL_TV:
+	case EM2882_BOARD_ZOLID_HYBRID_TV_STICK:
 		dvb->fe[0] = dvb_attach(zl10353_attach,
 					&em28xx_zl10353_xc3028_no_i2c_gate,
 					&dev->i2c_adap[dev->def_i2c_bus]);

em28xx.h +1 -0

index 5fc70d9..37bb696 100644
@@ -146,6 +146,7 @@
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB  99
 #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
 #define EM2884_BOARD_TERRATEC_H6		  101
+#define EM2882_BOARD_ZOLID_HYBRID_TV_STICK		102

Quoted 5 lines

Quoted 5 lines
Quoted 5 lines
em28xx.h line 152
Quoted 2 lines
em28xx.h +0 -0
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4      

Thanks,
Marcel

Mauro Carvalho Chehab

2018-04-25 14:45 UTC #5 lore raw

Em Wed, 25 Apr 2018 14:24:09 +0200
mjs <[email protected]> escreveu:

Quoted 48 lines

Op Wed, 25 Apr 2018 08:18:55 -0300
Mauro Carvalho Chehab <[email protected]> schreef:
Quoted 45 lines
Em Wed, 25 Apr 2018 12:11:10 +0200
mjs <[email protected]> escreveu:
Quoted 41 lines
Op Wed, 25 Apr 2018 06:16:20 -0300
Mauro Carvalho Chehab <[email protected]> schreef:
Quoted 10 lines
Em Wed, 25 Apr 2018 11:09:50 +0200
mjs <[email protected]> escreveu:
Quoted 7 lines
From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".
Extra code to be able to use this stick, only digital, not analog nor remote-control.
Quoted 7 lines
Quoted 4 lines
Changes to be committed:
	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h        
You forgot to add your Signed-off-by. That's mandatory for patches to be acepted.
Ok, still learning
Quoted 11 lines
Quoted 7 lines
      

---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)        
use git diff against upstream tree. This should be using a different paths there, e.g. drivers/media/usb/em28xx/...
This is actually against the upstream tree, in line with your advice in a previous mail.
After git clone... and ./build, I did not do "make install" but copy-paste out of the /media_build/linux/drivers/media/usb/em28xx Reason, I do not have an experimental pc and some parts are experimental.
I did not want to take the risk to crash my working pc at this moment in time.
I will try to work around this problem.

Quoted 7 lines

Quoted 5 lines
Upstream is actually this tree:
https://git.linuxtv.org/media_tree.git/
The media_build tree is what we call a "backport tree" :-)
I started with "https://linuxtv.org/wiki/index.php/Development:_How_to_submit_patches" in line with your advice in a previous mail.

The first line there at "Patch preparation" says:

"For Kernel media patches, they should be created against the Linux Kernel master linux_media git tree[1]"

[1] With links to: http://git.linuxtv.org/media_tree.git

Quoted 1 line

Followed the text to "https://linuxtv.org/wiki/index.php/How_to_Obtain,_Build_and_Install_V4L-DVB_Device Drivers" basic approach.

I see... here, information were indeed incomplete.

I just updated it.

Quoted 3 lines

Also to "https://git.linuxtv.org/media_build.git/about/"
I have used "git clone --depth=1 git://linuxtv.org/media_build.git" followed by ./build and copy/paste files mentioned above. This is not the required upstream tree ?

There's a similar instruction at media_tree.git/about, with is the one you would be using instead.

Quoted 4 lines

Work around:
Added the path to all files manually.
This is acceptable ?

An acceptable workaround would be to create another tree at the place it untars the driver's tarball (under linux dir), and do the diffs there.

The ./build script actually does something similar to that, if used with the --main-git option, but, if you're willing to use it, be careful to do on a separate clone, as otherwise it may destroy your work, as it will setup a different environment, and you'll lose any changes you've made inside that media_build cloned tree.

Thanks,
Mauro

mjs

author

2018-04-25 15:26 UTC #6 lore raw

Op Wed, 25 Apr 2018 11:45:05 -0300
Mauro Carvalho Chehab <[email protected]> schreef:

Quoted 88 lines

Em Wed, 25 Apr 2018 14:24:09 +0200
mjs <[email protected]> escreveu:
Quoted 48 lines
Op Wed, 25 Apr 2018 08:18:55 -0300
Mauro Carvalho Chehab <[email protected]> schreef:
Quoted 45 lines
Em Wed, 25 Apr 2018 12:11:10 +0200
mjs <[email protected]> escreveu:
Quoted 41 lines
Op Wed, 25 Apr 2018 06:16:20 -0300
Mauro Carvalho Chehab <[email protected]> schreef:
Quoted 10 lines
Em Wed, 25 Apr 2018 11:09:50 +0200
mjs <[email protected]> escreveu:
Quoted 7 lines
From 0a3355b47dc465c6372d30fa4a36d1c5db6c0fe2 Mon Sep 17 00:00:00 2001
From: Marcel Stork <[email protected]>
Date: Wed, 25 Apr 2018 10:53:34 +0200
Subject: [PATCH] Add new dvb-t board ":Zolid Hybrid Tv Stick".
Extra code to be able to use this stick, only digital, not analog nor remote-control.
Quoted 7 lines
Quoted 4 lines
Changes to be committed:
	modified:   em28xx-cards.c
	modified:   em28xx-dvb.c
	modified:   em28xx.h          
You forgot to add your Signed-off-by. That's mandatory for patches to be acepted.
Ok, still learning
Quoted 11 lines
Quoted 7 lines
        

---
 em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
 em28xx-dvb.c   |  1 +
 em28xx.h       |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)          
use git diff against upstream tree. This should be using a different paths there, e.g. drivers/media/usb/em28xx/...
This is actually against the upstream tree, in line with your advice in a previous mail.
After git clone... and ./build, I did not do "make install" but copy-paste out of the /media_build/linux/drivers/media/usb/em28xx Reason, I do not have an experimental pc and some parts are experimental.
I did not want to take the risk to crash my working pc at this moment in time.
I will try to work around this problem.
Quoted 7 lines
Quoted 5 lines
Upstream is actually this tree:
https://git.linuxtv.org/media_tree.git/
The media_build tree is what we call a "backport tree" :-)
I started with "https://linuxtv.org/wiki/index.php/Development:_How_to_submit_patches" in line with your advice in a previous mail.
The first line there at "Patch preparation" says:
"For Kernel media patches, they should be created against the Linux Kernel master linux_media git tree[1]"
[1] With links to: http://git.linuxtv.org/media_tree.git
Quoted 1 line
Followed the text to "https://linuxtv.org/wiki/index.php/How_to_Obtain,_Build_and_Install_V4L-DVB_Device Drivers" basic approach.
I see... here, information were indeed incomplete.
I just updated it.
Quoted 3 lines
Also to "https://git.linuxtv.org/media_build.git/about/"
I have used "git clone --depth=1 git://linuxtv.org/media_build.git" followed by ./build and copy/paste files mentioned above. This is not the required upstream tree ?
There's a similar instruction at media_tree.git/about, with is the one you would be using instead.
Quoted 4 lines
Work around:
Added the path to all files manually.
This is acceptable ?
An acceptable workaround would be to create another tree at the place it untars the driver's tarball (under linux dir), and do the diffs there.

Quoted 5 lines

The ./build script actually does something similar to that, if used with the --main-git option, but, if you're willing to use it, be careful to do on a separate clone, as otherwise it may destroy your work, as it will setup a different environment, and you'll lose any changes you've made inside that media_build cloned tree.

Oke, this time it will work.
Two new patches coming up soon.

Thanks,
Marcel

mjs

author

2018-04-26 19:43 UTC #7 lore raw

Re: [PATCH] [superseded] Add new dvb-t board \":Zolid Hybrid Tv Stick\"

superseded by msg130325

Thanks,
Marcel