Jesse Keating 2f82dd
[PATCH] dvb: add support for kworld 340u and ub435-q to em28xx-dvb
Jesse Keating 2f82dd
Jesse Keating 2f82dd
This adds support for the KWorld PlusTV 340U and KWorld UB345-Q ATSC
Jesse Keating 2f82dd
sticks, which are really the same device. The sticks have an eMPIA
Jesse Keating 2f82dd
em2870 usb bridge chipset, an LG Electronics LGDT3304 ATSC/QAM
Jesse Keating 2f82dd
demodulator and an NXP TDA18271HD tuner -- early versions of the 340U
Jesse Keating 2f82dd
have a a TDA18271HD/C1, later models and the UB435-Q have a C2.
Jesse Keating 2f82dd
Jesse Keating 2f82dd
The stick has been tested succesfully with both VSB_8 and QAM_256 signals.
Jesse Keating 2f82dd
Its using lgdt3304 support added to the lgdt3305 driver by a prior patch,
Jesse Keating 2f82dd
rather than the current lgdt3304 driver, as its severely lacking in
Jesse Keating 2f82dd
functionality by comparison (see said patch for details).
Jesse Keating 2f82dd
Jesse Keating 2f82dd
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Jesse Keating 2f82dd
Jesse Keating 2f82dd
---
Jesse Keating 2f82dd
Index: linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx-cards.c
Jesse Keating 2f82dd
===================================================================
Jesse Keating 2f82dd
--- linux-2.6.32.noarch.orig/drivers/media/video/em28xx/em28xx-cards.c
Jesse Keating 2f82dd
+++ linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx-cards.c
Jesse Keating 2f82dd
@@ -157,6 +157,22 @@ static struct em28xx_reg_seq evga_indtub
Jesse Keating 2f82dd
 	{ -1,			-1,	-1,		-1},
Jesse Keating 2f82dd
 };
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
+/*
Jesse Keating 2f82dd
+ * KWorld PlusTV 340U and UB435-Q (ATSC) GPIOs map:
Jesse Keating 2f82dd
+ * EM_GPIO_0 - currently unknown
Jesse Keating 2f82dd
+ * EM_GPIO_1 - LED disable/enable (1 = off, 0 = on)
Jesse Keating 2f82dd
+ * EM_GPIO_2 - currently unknown
Jesse Keating 2f82dd
+ * EM_GPIO_3 - currently unknown
Jesse Keating 2f82dd
+ * EM_GPIO_4 - TDA18271HD/C1 tuner (1 = active, 0 = in reset)
Jesse Keating 2f82dd
+ * EM_GPIO_5 - LGDT3304 ATSC/QAM demod (1 = active, 0 = in reset)
Jesse Keating 2f82dd
+ * EM_GPIO_6 - currently unknown
Jesse Keating 2f82dd
+ * EM_GPIO_7 - currently unknown
Jesse Keating 2f82dd
+ */
Jesse Keating 2f82dd
+static struct em28xx_reg_seq kworld_a340_digital[] = {
Jesse Keating 2f82dd
+	{EM28XX_R08_GPIO,	0x6d,		~EM_GPIO_4,	10},
Jesse Keating 2f82dd
+	{ -1,			-1,		-1,		-1},
Jesse Keating 2f82dd
+};
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
 /* Pinnacle Hybrid Pro eb1a:2881 */
Jesse Keating 2f82dd
 static struct em28xx_reg_seq pinnacle_hybrid_pro_analog[] = {
Jesse Keating 2f82dd
 	{EM28XX_R08_GPIO,	0xfd,   ~EM_GPIO_4,	10},
Jesse Keating 2f82dd
@@ -1587,6 +1603,16 @@ struct em28xx_board em28xx_boards[] = {
Jesse Keating 2f82dd
 		.tuner_gpio    = reddo_dvb_c_usb_box,
Jesse Keating 2f82dd
 		.has_dvb       = 1,
Jesse Keating 2f82dd
 	},
Jesse Keating 2f82dd
+	/* 1b80:a340 - Empia EM2870, NXP TDA18271HD and LG DT3304, sold
Jesse Keating 2f82dd
+	 * initially as the KWorld PlusTV 340U, then as the UB435-Q.
Jesse Keating 2f82dd
+	 * Early variants have a TDA18271HD/C1, later ones a TDA18271HD/C2 */
Jesse Keating 2f82dd
+	[EM2870_BOARD_KWORLD_A340] = {
Jesse Keating 2f82dd
+		.name       = "KWorld PlusTV 340U or UB435-Q (ATSC)",
Jesse Keating 2f82dd
+		.tuner_type = TUNER_ABSENT,	/* Digital-only TDA18271HD */
Jesse Keating 2f82dd
+		.has_dvb    = 1,
Jesse Keating 2f82dd
+		.dvb_gpio   = kworld_a340_digital,
Jesse Keating 2f82dd
+		.tuner_gpio = default_tuner_gpio,
Jesse Keating 2f82dd
+	},
Jesse Keating 2f82dd
 };
Jesse Keating 2f82dd
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
@@ -1704,6 +1730,8 @@ struct usb_device_id em28xx_id_table[] =
Jesse Keating 2f82dd
 			.driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
Jesse Keating 2f82dd
 	{ USB_DEVICE(0xeb1a, 0x50a6),
Jesse Keating 2f82dd
 			.driver_info = EM2860_BOARD_GADMEI_UTV330 },
Jesse Keating 2f82dd
+	{ USB_DEVICE(0x1b80, 0xa340),
Jesse Keating 2f82dd
+			.driver_info = EM2870_BOARD_KWORLD_A340 },
Jesse Keating 2f82dd
 	{ },
Jesse Keating 2f82dd
 };
Jesse Keating 2f82dd
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
Jesse Keating 2f82dd
Index: linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx-dvb.c
Jesse Keating 2f82dd
===================================================================
Jesse Keating 2f82dd
--- linux-2.6.32.noarch.orig/drivers/media/video/em28xx/em28xx-dvb.c
Jesse Keating 2f82dd
+++ linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx-dvb.c
Jesse Keating 2f82dd
@@ -29,11 +29,13 @@
Jesse Keating 2f82dd
 #include "tuner-simple.h"
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 #include "lgdt330x.h"
Jesse Keating 2f82dd
+#include "lgdt3305.h"
Jesse Keating 2f82dd
 #include "zl10353.h"
Jesse Keating 2f82dd
 #include "s5h1409.h"
Jesse Keating 2f82dd
 #include "mt352.h"
Jesse Keating 2f82dd
 #include "mt352_priv.h" /* FIXME */
Jesse Keating 2f82dd
 #include "tda1002x.h"
Jesse Keating 2f82dd
+#include "tda18271.h"
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 MODULE_DESCRIPTION("driver for em28xx based DVB cards");
Jesse Keating 2f82dd
 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
Jesse Keating 2f82dd
@@ -230,6 +232,18 @@ static struct lgdt330x_config em2880_lgd
Jesse Keating 2f82dd
 	.demod_chip = LGDT3303,
Jesse Keating 2f82dd
 };
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
+static struct lgdt3305_config em2870_lgdt3304_dev = {
Jesse Keating 2f82dd
+	.i2c_addr           = 0x0e,
Jesse Keating 2f82dd
+	.demod_chip         = LGDT3304,
Jesse Keating 2f82dd
+	.spectral_inversion = 1,
Jesse Keating 2f82dd
+	.deny_i2c_rptr      = 1,
Jesse Keating 2f82dd
+	.mpeg_mode          = LGDT3305_MPEG_PARALLEL,
Jesse Keating 2f82dd
+	.tpclk_edge         = LGDT3305_TPCLK_FALLING_EDGE,
Jesse Keating 2f82dd
+	.tpvalid_polarity   = LGDT3305_TP_VALID_HIGH,
Jesse Keating 2f82dd
+	.vsb_if_khz         = 3250,
Jesse Keating 2f82dd
+	.qam_if_khz         = 4000,
Jesse Keating 2f82dd
+};
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
 static struct zl10353_config em28xx_zl10353_with_xc3028 = {
Jesse Keating 2f82dd
 	.demod_address = (0x1e >> 1),
Jesse Keating 2f82dd
 	.no_tuner = 1,
Jesse Keating 2f82dd
@@ -246,6 +260,17 @@ static struct s5h1409_config em28xx_s5h1
Jesse Keating 2f82dd
 	.mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
Jesse Keating 2f82dd
 };
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
+static struct tda18271_std_map kworld_a340_std_map = {
Jesse Keating 2f82dd
+	.atsc_6   = { .if_freq = 3250, .agc_mode = 3, .std = 0,
Jesse Keating 2f82dd
+		      .if_lvl = 1, .rfagc_top = 0x37, },
Jesse Keating 2f82dd
+	.qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 1,
Jesse Keating 2f82dd
+		      .if_lvl = 1, .rfagc_top = 0x37, },
Jesse Keating 2f82dd
+};
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
+static struct tda18271_config kworld_a340_config = {
Jesse Keating 2f82dd
+	.std_map           = &kworld_a340_std_map,
Jesse Keating 2f82dd
+};
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
 static struct zl10353_config em28xx_zl10353_xc3028_no_i2c_gate = {
Jesse Keating 2f82dd
 	.demod_address = (0x1e >> 1),
Jesse Keating 2f82dd
 	.no_tuner = 1,
Jesse Keating 2f82dd
@@ -568,6 +593,14 @@ static int dvb_init(struct em28xx *dev)
Jesse Keating 2f82dd
 			}
Jesse Keating 2f82dd
 		}
Jesse Keating 2f82dd
 		break;
Jesse Keating 2f82dd
+	case EM2870_BOARD_KWORLD_A340:
Jesse Keating 2f82dd
+		dvb->frontend = dvb_attach(lgdt3305_attach,
Jesse Keating 2f82dd
+					   &em2870_lgdt3304_dev,
Jesse Keating 2f82dd
+					   &dev->i2c_adap);
Jesse Keating 2f82dd
+		if (dvb->frontend != NULL)
Jesse Keating 2f82dd
+			dvb_attach(tda18271_attach, dvb->frontend, 0x60,
Jesse Keating 2f82dd
+				   &dev->i2c_adap, &kworld_a340_config);
Jesse Keating 2f82dd
+		break;
Jesse Keating 2f82dd
 	default:
Jesse Keating 2f82dd
 		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
Jesse Keating 2f82dd
 				" isn't supported yet\n",
Jesse Keating 2f82dd
Index: linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx.h
Jesse Keating 2f82dd
===================================================================
Jesse Keating 2f82dd
--- linux-2.6.32.noarch.orig/drivers/media/video/em28xx/em28xx.h
Jesse Keating 2f82dd
+++ linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx.h
Jesse Keating 2f82dd
@@ -110,6 +110,7 @@
Jesse Keating 2f82dd
 #define EM2820_BOARD_SILVERCREST_WEBCAM           71
Jesse Keating 2f82dd
 #define EM2861_BOARD_GADMEI_UTV330PLUS           72
Jesse Keating 2f82dd
 #define EM2870_BOARD_REDDO_DVB_C_USB_BOX          73
Jesse Keating 2f82dd
+#define EM2870_BOARD_KWORLD_A340		  76
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 /* Limits minimum and default number of buffers */
Jesse Keating 2f82dd
 #define EM28XX_MIN_BUF 4