* [PATCH] [2] Add new dvb-t board ":Zolid Hybrid Tv Stick"
@ 2018-04-25 18:59 mjs
2018-04-26 18:33 ` [PATCH] [2] [ do not use] Add new dvb-t board \":Zolid Hybrid Tv Stick\" mjs
2018-04-26 19:46 ` [PATCH] [2] [superseded] " mjs
0 siblings, 2 replies; 3+ messages in thread
From: mjs @ 2018-04-25 18:59 UTC (permalink / raw)
To: 3 linux-media@vger.kernel.org
From 911e4ce75588f23ead083fd520a45af5336ee761 Mon Sep 17 00:00:00 2001
From: Marcel Stork <mjstork@gmail.com>
Date: Wed, 25 Apr 2018 19:49:07 +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: drivers/media/usb/em28xx/em28xx-cards.c
modified: drivers/media/usb/em28xx/em28xx-dvb.c
modified: drivers/media/usb/em28xx/em28xx.h
Signed-off-by: Marcel Stork <mjstork@gmail.com>
---
drivers/media/usb/em28xx/em28xx-cards.c | 30 +++++++++++++++++++++++++++++-
drivers/media/usb/em28xx/em28xx-dvb.c | 1 +
drivers/media/usb/em28xx/em28xx.h | 1 +
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 6e0e67d2..bc8b099f 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -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},
@@ -666,6 +681,16 @@ const struct em28xx_board em28xx_boards[] = {
.tuner_type = TUNER_ABSENT,
.is_webcam = 1, /* To enable sensor probe */
},
+ [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,
+ },
[EM2750_BOARD_DLCW_130] = {
/* Beijing Huaqi Information Digital Technology Co., Ltd */
.name = "Huaqi DLCW-130",
@@ -2487,7 +2512,7 @@ struct usb_device_id em28xx_id_table[] = {
.driver_info = EM2820_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0x2862),
.driver_info = EM2820_BOARD_UNKNOWN },
- { USB_DEVICE(0xeb1a, 0x2863),
+ { USB_DEVICE(0xeb1a, 0x2863), /* used by :zolid hybrid tv stick */
.driver_info = EM2820_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0x2870),
.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:
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index a54cb8dc..67b16036 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -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]);
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 63c7c612..6e44edd2 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -148,6 +148,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
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] [2] [ do not use] Add new dvb-t board \":Zolid Hybrid Tv Stick\"
2018-04-25 18:59 [PATCH] [2] Add new dvb-t board ":Zolid Hybrid Tv Stick" mjs
@ 2018-04-26 18:33 ` mjs
2018-04-26 19:46 ` [PATCH] [2] [superseded] " mjs
1 sibling, 0 replies; 3+ messages in thread
From: mjs @ 2018-04-26 18:33 UTC (permalink / raw)
To: mjstork, 3 linux-media@vger.kernel.org
I am sorry, I have made a mistake.
I will sent in a correct version.
Thanks,
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] [2] [superseded] Add new dvb-t board \":Zolid Hybrid Tv Stick\"
2018-04-25 18:59 [PATCH] [2] Add new dvb-t board ":Zolid Hybrid Tv Stick" mjs
2018-04-26 18:33 ` [PATCH] [2] [ do not use] Add new dvb-t board \":Zolid Hybrid Tv Stick\" mjs
@ 2018-04-26 19:46 ` mjs
1 sibling, 0 replies; 3+ messages in thread
From: mjs @ 2018-04-26 19:46 UTC (permalink / raw)
To: mjstork, 3 linux-media@vger.kernel.org
superseded by msg130325
Thanks,
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-26 19:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-25 18:59 [PATCH] [2] Add new dvb-t board ":Zolid Hybrid Tv Stick" mjs
2018-04-26 18:33 ` [PATCH] [2] [ do not use] Add new dvb-t board \":Zolid Hybrid Tv Stick\" mjs
2018-04-26 19:46 ` [PATCH] [2] [superseded] " mjs
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.