The patch number 9924 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Mauro Carvalho Chehab <[email protected]>
merge: http://www.linuxtv.org/hg/~dheitmueller/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/Documentation/video4linux/CARDLIST.em28xx | 4 ++--
linux/drivers/media/common/tuners/xc5000.c | 7 -------
linux/drivers/media/video/em28xx/em28xx-cards.c | 6 +++++-
linux/drivers/media/video/em28xx/em28xx-reg.h | 1 +
linux/drivers/media/video/em28xx/em28xx-video.c | 3 ++-
5 files changed, 10 insertions(+), 11 deletions(-)
diff -r f869312b9b98 -r 6241895c64f2
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Thu Dec 18 13:05:51
2008 -0200
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Thu Dec 18 13:07:18
2008 -0200
@@ -1,5 +1,5 @@
0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
- 1 -> Unknown EM2750/28xx video grabber (em2820/em2840)
[eb1a:2820,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
+ 1 -> Unknown EM2750/28xx video grabber (em2820/em2840)
[eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
4 -> Hauppauge WinTV USB 2 (em2820/em2840)
[2040:4200,2040:4201]
@@ -12,7 +12,7 @@
11 -> Terratec Hybrid XS (em2880) [0ccd:0042]
12 -> Kworld PVR TV 2800 RF (em2820/em2840)
13 -> Terratec Prodigy XS (em2880) [0ccd:0047]
- 14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) [eb1a:2821]
+ 14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)
15 -> V-Gear PocketTV (em2800)
16 -> Hauppauge WinTV HVR 950 (em2883)
[2040:6513,2040:6517,2040:651b]
17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]
diff -r f869312b9b98 -r 6241895c64f2 linux/drivers/media/common/tuners/xc5000.c
--- a/linux/drivers/media/common/tuners/xc5000.c Thu Dec 18 13:05:51
2008 -0200
+++ b/linux/drivers/media/common/tuners/xc5000.c Thu Dec 18 13:07:18
2008 -0200
@@ -35,10 +35,6 @@ static int debug;
static int debug;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
-
-static int xc5000_load_fw_on_attach;
-module_param_named(init_fw, xc5000_load_fw_on_attach, int, 0644);
-MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization.");
static DEFINE_MUTEX(xc5000_list_mutex);
static LIST_HEAD(hybrid_tuner_instance_list);
@@ -1036,9 +1032,6 @@ struct dvb_frontend *xc5000_attach(struc
memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops,
sizeof(struct dvb_tuner_ops));
- if (xc5000_load_fw_on_attach)
- xc5000_init(fe);
-
return fe;
fail:
mutex_unlock(&xc5000_list_mutex);
diff -r f869312b9b98 -r 6241895c64f2
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Thu Dec 18 13:05:51
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Thu Dec 18 13:07:18
2008 -0200
@@ -1311,7 +1311,7 @@ struct usb_device_id em28xx_id_table []
{ USB_DEVICE(0xeb1a, 0x2820),
.driver_info = EM2820_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0x2821),
- .driver_info = EM2820_BOARD_PROLINK_PLAYTV_USB2 },
+ .driver_info = EM2820_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0x2860),
.driver_info = EM2820_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0x2861),
@@ -1478,6 +1478,10 @@ void em28xx_pre_card_setup(struct em28xx
case CHIP_ID_EM2860:
em28xx_info("chip ID is em2860\n");
break;
+ case CHIP_ID_EM2870:
+ em28xx_info("chip ID is em2870\n");
+ dev->wait_after_write = 0;
+ break;
case CHIP_ID_EM2874:
em28xx_info("chip ID is em2874\n");
dev->reg_gpio_num = EM2874_R80_GPIO;
diff -r f869312b9b98 -r 6241895c64f2
linux/drivers/media/video/em28xx/em28xx-reg.h
--- a/linux/drivers/media/video/em28xx/em28xx-reg.h Thu Dec 18 13:05:51
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-reg.h Thu Dec 18 13:07:18
2008 -0200
@@ -151,6 +151,7 @@ enum em28xx_chip_id {
CHIP_ID_EM2840 = 20,
CHIP_ID_EM2750 = 33,
CHIP_ID_EM2860 = 34,
+ CHIP_ID_EM2870 = 35,
CHIP_ID_EM2883 = 36,
CHIP_ID_EM2874 = 65,
};
diff -r f869312b9b98 -r 6241895c64f2
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c Thu Dec 18 13:05:51
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c Thu Dec 18 13:07:18
2008 -0200
@@ -555,10 +555,11 @@ static void em28xx_config_i2c(struct em2
static void em28xx_config_i2c(struct em28xx *dev)
{
struct v4l2_routing route;
+ int zero = 0;
route.input = INPUT(dev->ctl_input)->vmux;
route.output = 0;
- em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
+ em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, &zero);
em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6241895c64f2f77b43e1f90ded51934b3ead18e6
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
