The patch number 13211 was added via David T.L. Wong <davidtlw...@gmail.com>
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:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
cx23885: card Mygica X8506 analog TV support
Signed-Off-By: David T.L. Wong<davidtlw...@gmail.com>
Signed-Off-By: David T.L. Wong <davidtlw...@gmail.com>
---
linux/drivers/media/video/cx23885/cx23885-cards.c | 14 ++++++++++++--
linux/drivers/media/video/cx23885/cx23885-dvb.c | 5 +++++
linux/drivers/media/video/cx23885/cx23885-video.c | 8 ++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
diff -r d83c83f8b047 -r 045b0283962e
linux/drivers/media/video/cx23885/cx23885-cards.c
--- a/linux/drivers/media/video/cx23885/cx23885-cards.c Wed Oct 21 23:29:11
2009 +0800
+++ b/linux/drivers/media/video/cx23885/cx23885-cards.c Thu Oct 22 00:15:30
2009 +0800
@@ -201,11 +201,16 @@
},
[CX23885_BOARD_MYGICA_X8506] = {
.name = "Mygica X8506 DMB-TH",
- .tuner_type = TUNER_ABSENT,
+ .tuner_type = TUNER_XC5000,
+ .tuner_addr = 0x61,
.porta = CX23885_ANALOG_VIDEO,
.portb = CX23885_MPEG_DVB,
.input = {
{
+ .type = CX23885_VMUX_TELEVISION,
+ .vmux = CX25840_COMPOSITE2,
+ },
+ {
.type = CX23885_VMUX_COMPOSITE1,
.vmux = CX25840_COMPOSITE8,
},
@@ -225,11 +230,16 @@
},
[CX23885_BOARD_MAGICPRO_PROHDTVE2] = {
.name = "Magic-Pro ProHDTV Extreme 2",
- .tuner_type = TUNER_ABSENT,
+ .tuner_type = TUNER_XC5000,
+ .tuner_addr = 0x61,
.porta = CX23885_ANALOG_VIDEO,
.portb = CX23885_MPEG_DVB,
.input = {
{
+ .type = CX23885_VMUX_TELEVISION,
+ .vmux = CX25840_COMPOSITE2,
+ },
+ {
.type = CX23885_VMUX_COMPOSITE1,
.vmux = CX25840_COMPOSITE8,
},
diff -r d83c83f8b047 -r 045b0283962e
linux/drivers/media/video/cx23885/cx23885-dvb.c
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c Wed Oct 21 23:29:11
2009 +0800
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c Thu Oct 22 00:15:30
2009 +0800
@@ -487,6 +487,11 @@
break;
}
break;
+ case CX23885_BOARD_MYGICA_X8506:
+ case CX23885_BOARD_MAGICPRO_PROHDTVE2:
+ /* Select Digital TV */
+ cx23885_gpio_set(dev, GPIO_0);
+ break;
}
return 0;
}
diff -r d83c83f8b047 -r 045b0283962e
linux/drivers/media/video/cx23885/cx23885-video.c
--- a/linux/drivers/media/video/cx23885/cx23885-video.c Wed Oct 21 23:29:11
2009 +0800
+++ b/linux/drivers/media/video/cx23885/cx23885-video.c Thu Oct 22 00:15:30
2009 +0800
@@ -437,6 +437,13 @@
INPUT(input)->gpio2, INPUT(input)->gpio3);
dev->input = input;
+ if (dev->board == CX23885_BOARD_MYGICA_X8506 ||
+ dev->board == CX23885_BOARD_MAGICPRO_PROHDTVE2) {
+ /* Select Analog TV */
+ if (INPUT(input)->type == CX23885_VMUX_TELEVISION)
+ cx23885_gpio_clear(dev, GPIO_0);
+ }
+
/* Tell the internal A/V decoder */
v4l2_subdev_call(dev->sd_cx25840, video, s_routing,
INPUT(input)->vmux, 0, 0);
@@ -1764,6 +1771,7 @@
tun_setup.mode_mask = T_ANALOG_TV;
tun_setup.type = dev->tuner_type;
tun_setup.addr = v4l2_i2c_subdev_addr(sd);
+ tun_setup.tuner_callback = cx23885_tuner_callback;
v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/045b0283962e3c880463acf14809afc8a2bb42ba
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
