rpms/kernel/F-12 kernel.spec, 1.2082, 1.2083 linux-2.6-v4l-dvb-add-kworld-a340-support.patch, 1.1, 1.2
Jarod Wilson
jwilson at fedoraproject.org
Fri May 14 13:54:29 UTC 2010
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9873
Modified Files:
kernel.spec linux-2.6-v4l-dvb-add-kworld-a340-support.patch
Log Message:
* Fri May 14 2010 Jarod Wilson <jarod at redhat.com>
- Update previous kworld patch w/the one that actually works
correctly w/o constant rf tracking filter recalibration
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2082
retrieving revision 1.2083
diff -u -p -r1.2082 -r1.2083
--- kernel.spec 13 May 2010 04:34:34 -0000 1.2082
+++ kernel.spec 14 May 2010 13:54:29 -0000 1.2083
@@ -2146,6 +2146,10 @@ fi
# and build.
%changelog
+* Fri May 14 2010 Jarod Wilson <jarod at redhat.com>
+- Update previous kworld patch w/the one that actually works
+ correctly w/o constant rf tracking filter recalibration
+
* Thu May 13 2010 Jarod Wilson <jarod at redhat.com> 2.6.32.13-120
- Restore patch to enable hauppauge hdpvr ir part
- Enable support for kworld ub435-q and 340u usb atsc tuners
linux-2.6-v4l-dvb-add-kworld-a340-support.patch:
em28xx-cards.c | 28 ++++++++++++++++++++++++++++
em28xx-dvb.c | 33 +++++++++++++++++++++++++++++++++
em28xx.h | 1 +
3 files changed, 62 insertions(+)
Index: linux-2.6-v4l-dvb-add-kworld-a340-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-v4l-dvb-add-kworld-a340-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-v4l-dvb-add-kworld-a340-support.patch 13 May 2010 04:32:39 -0000 1.1
+++ linux-2.6-v4l-dvb-add-kworld-a340-support.patch 14 May 2010 13:54:29 -0000 1.2
@@ -1,28 +1,24 @@
-From a4270a057c5200e341d09955cac6c38bb7c938d3 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod at redhat.com>
-Date: Mon, 15 Feb 2010 17:15:31 -0500
-Subject: [PATCH 2/2] dvb: add support for kworld 340u to em28xx-dvb
+[PATCH] dvb: add support for kworld 340u and ub435-q to em28xx-dvb
-This adds support for the KWorld PlusTV 340U (ATSC), an eMPIA
-em2870-based usb tv tuner stick. The device has an LG Electronics
-LGDT3304 ATSC/QAM demodulator and an NXP TDA18271HD/C1 tuner, and has
-been tested succesfully with both VSB_8 and QAM_256 signals. Its using
-lgdt3304 support added to the lgdt3305 driver by a prior patch, rather
-than the current lgdt3304 driver, as its severely lacking in
+This adds support for the KWorld PlusTV 340U and KWorld UB345-Q ATSC
+sticks, which are really the same device. The sticks have an eMPIA
+em2870 usb bridge chipset, an LG Electronics LGDT3304 ATSC/QAM
+demodulator and an NXP TDA18271HD tuner -- early versions of the 340U
+have a a TDA18271HD/C1, later models and the UB435-Q have a C2.
+
+The stick has been tested succesfully with both VSB_8 and QAM_256 signals.
+Its using lgdt3304 support added to the lgdt3305 driver by a prior patch,
+rather than the current lgdt3304 driver, as its severely lacking in
functionality by comparison (see said patch for details).
Signed-off-by: Jarod Wilson <jarod at redhat.com>
----
- drivers/media/video/em28xx/em28xx-cards.c | 29 +++++++++++++++++++++++++
- drivers/media/video/em28xx/em28xx-dvb.c | 33 +++++++++++++++++++++++++++++
- drivers/media/video/em28xx/em28xx.h | 1 +
- 3 files changed, 63 insertions(+), 0 deletions(-)
+---
Index: linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx-cards.c
===================================================================
--- linux-2.6.32.noarch.orig/drivers/media/video/em28xx/em28xx-cards.c
+++ linux-2.6.32.noarch/drivers/media/video/em28xx/em28xx-cards.c
-@@ -157,6 +157,23 @@ static struct em28xx_reg_seq evga_indtub
+@@ -157,6 +157,22 @@ static struct em28xx_reg_seq evga_indtub
{ -1, -1, -1, -1},
};
@@ -38,15 +34,14 @@ Index: linux-2.6.32.noarch/drivers/media
+ * EM_GPIO_7 - currently unknown
+ */
+static struct em28xx_reg_seq kworld_a340_digital[] = {
-+ //{EM28XX_R08_GPIO, 0x7d, 0xff, 10},
-+ {EM28XX_R08_GPIO, 0x6d, 0xff, 10},
-+ { -1, -1, -1, -1},
++ {EM28XX_R08_GPIO, 0x6d, ~EM_GPIO_4, 10},
++ { -1, -1, -1, -1},
+};
+
/* Pinnacle Hybrid Pro eb1a:2881 */
static struct em28xx_reg_seq pinnacle_hybrid_pro_analog[] = {
{EM28XX_R08_GPIO, 0xfd, ~EM_GPIO_4, 10},
-@@ -1587,6 +1604,16 @@ struct em28xx_board em28xx_boards[] = {
+@@ -1587,6 +1603,16 @@ struct em28xx_board em28xx_boards[] = {
.tuner_gpio = reddo_dvb_c_usb_box,
.has_dvb = 1,
},
@@ -63,7 +58,7 @@ Index: linux-2.6.32.noarch/drivers/media
};
const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
-@@ -1704,6 +1731,8 @@ struct usb_device_id em28xx_id_table[] =
+@@ -1704,6 +1730,8 @@ struct usb_device_id em28xx_id_table[] =
.driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
{ USB_DEVICE(0xeb1a, 0x50a6),
.driver_info = EM2860_BOARD_GADMEI_UTV330 },
@@ -90,7 +85,7 @@ Index: linux-2.6.32.noarch/drivers/media
MODULE_DESCRIPTION("driver for em28xx based DVB cards");
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab at infradead.org>");
-@@ -230,6 +232,17 @@ static struct lgdt330x_config em2880_lgd
+@@ -230,6 +232,18 @@ static struct lgdt330x_config em2880_lgd
.demod_chip = LGDT3303,
};
@@ -98,6 +93,7 @@ Index: linux-2.6.32.noarch/drivers/media
+ .i2c_addr = 0x0e,
+ .demod_chip = LGDT3304,
+ .spectral_inversion = 1,
++ .deny_i2c_rptr = 1,
+ .mpeg_mode = LGDT3305_MPEG_PARALLEL,
+ .tpclk_edge = LGDT3305_TPCLK_FALLING_EDGE,
+ .tpvalid_polarity = LGDT3305_TP_VALID_HIGH,
@@ -108,7 +104,7 @@ Index: linux-2.6.32.noarch/drivers/media
static struct zl10353_config em28xx_zl10353_with_xc3028 = {
.demod_address = (0x1e >> 1),
.no_tuner = 1,
-@@ -246,6 +259,18 @@ static struct s5h1409_config em28xx_s5h1
+@@ -246,6 +260,17 @@ static struct s5h1409_config em28xx_s5h1
.mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
};
@@ -121,7 +117,6 @@ Index: linux-2.6.32.noarch/drivers/media
+
+static struct tda18271_config kworld_a340_config = {
+ .std_map = &kworld_a340_std_map,
-+ .rf_cal_on_startup = 1,
+};
+
static struct zl10353_config em28xx_zl10353_xc3028_no_i2c_gate = {
@@ -150,7 +145,7 @@ Index: linux-2.6.32.noarch/drivers/media
#define EM2820_BOARD_SILVERCREST_WEBCAM 71
#define EM2861_BOARD_GADMEI_UTV330PLUS 72
#define EM2870_BOARD_REDDO_DVB_C_USB_BOX 73
-+#define EM2870_BOARD_KWORLD_A340 76
++#define EM2870_BOARD_KWORLD_A340 76
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
More information about the scm-commits
mailing list