* Fri Jul 30 2010 Jarod Wilson <jarod@redhat.com>

- lirc staging update
- update kworld patch to one committed upstream
- can't believe how much nicer dist-git is than dist-cvs

1 files changed, 35 insertions, 31 deletions

diff --git a/linux-2.6-v4l-dvb-add-kworld-a340-support.patch b/linux-2.6-v4l-dvb-add-kworld-a340-support.patch
index 0c7d24117..f1ac30793 100644
--- a/linux-2.6-v4l-dvb-add-kworld-a340-support.patch
+++ b/linux-2.6-v4l-dvb-add-kworld-a340-support.patch
@@ -1,28 +1,35 @@
-From c34c78838f02693a70808e38309629e85aa50266 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Thu, 20 May 2010 10:03:13 -0400
-Subject: [PATCH] dvb: add support for kworld 340u and ub435-q to em28xx-dvb
+commit 611225f5e7f9d11c4b119fac224f1bd6903b0150
+Author: Jarod Wilson <jarod@redhat.com>
+Date:   Sun Mar 7 17:55:43 2010 -0300
 
-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@redhat.com>
----
- drivers/media/video/em28xx/em28xx-cards.c |   28 ++++++++++++++++++++++++
- drivers/media/video/em28xx/em28xx-dvb.c   |   33 +++++++++++++++++++++++++++++
- drivers/media/video/em28xx/em28xx.h       |    1 +
- 3 files changed, 62 insertions(+), 0 deletions(-)
+    V4L/DVB: dvb: add support for kworld 340u and ub435-q to em28xx-dvb
+    
+    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@redhat.com>
+    Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
 
+diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
+index 3a623aa..5c56875 100644
+--- a/Documentation/video4linux/CARDLIST.em28xx
++++ b/Documentation/video4linux/CARDLIST.em28xx
+@@ -72,3 +72,4 @@
+  73 -> Reddo DVB-C USB TV Box                   (em2870)
+  74 -> Actionmaster/LinXcel/Digitus VC211A      (em2800)
+  75 -> Dikom DK300                              (em2882)
++ 76 -> KWorld PlusTV 340U or UB435-Q (ATSC)     (em2870)        [1b80:a340]
 diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
-index b0fb083..6312e76 100644
+index 3a4fd85..ffbe544 100644
 --- a/drivers/media/video/em28xx/em28xx-cards.c
 +++ b/drivers/media/video/em28xx/em28xx-cards.c
 @@ -158,6 +158,22 @@ static struct em28xx_reg_seq evga_indtube_digital[] = {
@@ -48,7 +55,7 @@ index b0fb083..6312e76 100644
  /* Pinnacle Hybrid Pro eb1a:2881 */
  static struct em28xx_reg_seq pinnacle_hybrid_pro_analog[] = {
  	{EM28XX_R08_GPIO,	0xfd,   ~EM_GPIO_4,	10},
-@@ -1649,6 +1665,16 @@ struct em28xx_board em28xx_boards[] = {
+@@ -1667,6 +1683,16 @@ struct em28xx_board em28xx_boards[] = {
  		.tuner_gpio    = reddo_dvb_c_usb_box,
  		.has_dvb       = 1,
  	},
@@ -65,7 +72,7 @@ index b0fb083..6312e76 100644
  };
  const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
  
-@@ -1768,6 +1794,8 @@ struct usb_device_id em28xx_id_table[] = {
+@@ -1788,6 +1814,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 },
@@ -75,7 +82,7 @@ index b0fb083..6312e76 100644
  };
  MODULE_DEVICE_TABLE(usb, em28xx_id_table);
 diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
-index bcd3c37..ce8a9ee 100644
+index cf1d8c3..3ac8d30 100644
 --- a/drivers/media/video/em28xx/em28xx-dvb.c
 +++ b/drivers/media/video/em28xx/em28xx-dvb.c
 @@ -30,11 +30,13 @@
@@ -129,7 +136,7 @@ index bcd3c37..ce8a9ee 100644
  static struct zl10353_config em28xx_zl10353_xc3028_no_i2c_gate = {
  	.demod_address = (0x1e >> 1),
  	.no_tuner = 1,
-@@ -570,6 +595,14 @@ static int dvb_init(struct em28xx *dev)
+@@ -572,6 +597,14 @@ static int dvb_init(struct em28xx *dev)
  			}
  		}
  		break;
@@ -145,10 +152,10 @@ index bcd3c37..ce8a9ee 100644
  		em28xx_errdev("/2: The frontend of your DVB/ATSC card"
  				" isn't supported yet\n");
 diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
-index ba6fe5d..9f3fdad 100644
+index 6216786..1c61a6b 100644
 --- a/drivers/media/video/em28xx/em28xx.h
 +++ b/drivers/media/video/em28xx/em28xx.h
-@@ -112,6 +112,7 @@
+@@ -114,6 +114,7 @@
  #define EM2870_BOARD_REDDO_DVB_C_USB_BOX          73
  #define EM2800_BOARD_VC211A			  74
  #define EM2882_BOARD_DIKOM_DK300		  75
@@ -156,6 +163,3 @@ index ba6fe5d..9f3fdad 100644
  
  /* Limits minimum and default number of buffers */
  #define EM28XX_MIN_BUF 4
--- 
-1.7.0.1
-