Add initial support for DViCO FusionHDTV DVB-T Dual Express<br><br>From: Stephen Backway <stev391@email.com><br><br>Add initial support (Note: Only one tuner is activated, due to issues with the<br>SRAM definitions. Once fixed this will be enabled). The analog portion of the<br>card is not configured. Original work to support this card was completed by<br>Chris Pascoe, however this was never merged into the main tree. Minor changes<br>were required to ensure that the card worked correctly, namely the callback <br>function, kernel config and various debugging messages.<br><br>Signed-off-by: Stephen Backway <stev391@email.com><br><br>diff -Naur v4l-dvb/linux/Documentation/video4linux/CARDLIST.cx23885 v4l-dvb_dev/linux/Documentation/video4linux/CARDLIST.cx23885<br>--- v4l-dvb/linux/Documentation/video4linux/CARDLIST.cx23885 2008-06-09 14:13:20.000000000 +1000<br>+++ v4l-dvb_dev/linux/Documentation/video4linux/CARDLIST.cx23885 2008-06-30 21:06:19.000000000 +1000<br>@@ -9,3 +9,4 @@<br> 8 -> Hauppauge WinTV-HVR1700 [0070:8101]<br> 9 -> Hauppauge WinTV-HVR1400 [0070:8010]<br> 10 -> DViCO FusionHDTV7 Dual Express [18ac:d618]<br>+ 11 -> DViCO FusionHDTV DVB-T Dual Express [18ac:db78]<br>diff -Naur v4l-dvb/linux/drivers/media/video/cx23885/cx23885-cards.c v4l-dvb_dev/linux/drivers/media/video/cx23885/cx23885-cards.c<br>--- v4l-dvb/linux/drivers/media/video/cx23885/cx23885-cards.c 2008-06-09 14:13:21.000000000 +1000<br>+++ v4l-dvb_dev/linux/drivers/media/video/cx23885/cx23885-cards.c 2008-06-30 21:08:18.000000000 +1000<br>@@ -151,6 +151,13 @@<br> #endif<br> .portc = CX23885_MPEG_DVB,<br> },<br>+ [CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP] = {<br>+ .name = "DViCO FusionHDTV DVB-T Dual Express",<br>+#if 0<br>+ .portb = CX23885_MPEG_DVB,<br>+#endif<br>+ .portc = CX23885_MPEG_DVB,<br>+ },<br> };<br> const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);<br> <br>@@ -222,7 +229,11 @@<br> .subvendor = 0x18ac,<br> .subdevice = 0xd618,<br> .card = CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP,<br>- },<br>+ }, {<br>+ .subvendor = 0x18ac,<br>+ .subdevice = 0xdb78,<br>+ .card = CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP,<br>+ },<br> };<br> const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);<br> <br>@@ -439,6 +450,13 @@<br> mdelay(20);<br> cx_set(GP0_IO, 0x00050005);<br> break;<br>+ case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:<br>+ /* GPIO-0 portb xc3028 reset */<br>+ /* GPIO-1 portb zl10353 reset */<br>+ /* GPIO-2 portc xc3028 reset */<br>+ /* GPIO-3 portc zl10353 reset */<br>+ cx_write(GP0_IO, 0x002f1000);<br>+ break;<br> }<br> }<br> <br>@@ -453,7 +471,10 @@<br> case CX23885_BOARD_HAUPPAUGE_HVR1400:<br> /* FIXME: Implement me */<br> break;<br>- }<br>+ case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:<br>+ request_module("ir-kbd-i2c");<br>+ break;<br>+ }<br> <br> return 0;<br> }<br>@@ -490,6 +511,7 @@<br> <br> switch (dev->board) {<br> case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:<br>+ case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:<br> ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */<br> ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */<br> ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;<br>diff -Naur v4l-dvb/linux/drivers/media/video/cx23885/cx23885-dvb.c v4l-dvb_dev/linux/drivers/media/video/cx23885/cx23885-dvb.c<br>--- v4l-dvb/linux/drivers/media/video/cx23885/cx23885-dvb.c 2008-06-09 14:13:21.000000000 +1000<br>+++ v4l-dvb_dev/linux/drivers/media/video/cx23885/cx23885-dvb.c 2008-06-30 21:06:19.000000000 +1000<br>@@ -36,9 +36,11 @@<br> #include "tda8290.h"<br> #include "tda18271.h"<br> #include "lgdt330x.h"<br>+#include "zl10353.h"<br> #include "xc5000.h"<br> #include "tda10048.h"<br> #include "tuner-xc2028.h"<br>+#include "tuner-xc2028-types.h"<br> #include "tuner-simple.h"<br> #include "dib7000p.h"<br> #include "dibx000_common.h"<br>@@ -155,6 +157,44 @@<br> .serial_mpeg = 0x40,<br> };<br> <br>+static int cx23885_dvico_xc2028_callback(void *ptr, int command, int arg)<br>+{<br>+ struct cx23885_tsport *port = ptr;<br>+ struct cx23885_dev *dev = port->dev;<br>+ u32 reset_mask = 0;<br>+<br>+ switch (command) {<br>+ case XC2028_TUNER_RESET:<br>+ dprintk(1, "%s: XC2028_TUNER_RESET %d, port %d\n", __func__,<br>+ arg, port->nr);<br>+<br>+ if (port->nr == 0)<br>+ reset_mask = 0x0101;<br>+ else if (port->nr == 1)<br>+ reset_mask = 0x0404;<br>+<br>+ cx_clear(GP0_IO, reset_mask);<br>+ mdelay(5);<br>+ cx_set(GP0_IO, reset_mask);<br>+ break;<br>+ case XC2028_RESET_CLK:<br>+ dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);<br>+ break;<br>+ default:<br>+ dprintk(1, "%s: unknown command %d, arg %d\n", __func__,<br>+ command, arg);<br>+ return -EINVAL;<br>+ }<br>+<br>+ return 0;<br>+}<br>+<br>+static struct zl10353_config dvico_fusionhdtv_xc3028 = {<br>+ .demod_address = 0x0f,<br>+ .if2 = 45600,<br>+ .no_tuner = 1,<br>+};<br>+<br> static struct s5h1409_config hauppauge_hvr1500q_config = {<br> .demod_address = 0x32 >> 1,<br> .output_mode = S5H1409_SERIAL_OUTPUT,<br>@@ -481,7 +521,39 @@<br> &i2c_bus->i2c_adap,<br> &dvico_xc5000_tunerconfig, i2c_bus);<br> break;<br>- default:<br>+ case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:<br>+ i2c_bus = &dev->i2c_bus[port->nr - 1];<br>+<br>+ /* Take demod and tuner out of reset */<br>+ if (port->nr == 1)<br>+ cx_set(GP0_IO, 0x0303);<br>+ else if (port->nr == 2)<br>+ cx_set(GP0_IO, 0x0c0c);<br>+ mdelay(5);<br>+ port->dvb.frontend = dvb_attach(zl10353_attach,<br>+ &dvico_fusionhdtv_xc3028,<br>+ &i2c_bus->i2c_adap);<br>+ if (port->dvb.frontend != NULL) {<br>+ struct dvb_frontend *fe;<br>+ struct xc2028_config cfg = {<br>+ .i2c_adap = &i2c_bus->i2c_adap,<br>+ .i2c_addr = 0x61,<br>+ .video_dev = port,<br>+ .callback = cx23885_dvico_xc2028_callback,<br>+ };<br>+ static struct xc2028_ctrl ctl = {<br>+ .fname = "xc3028-v27.fw",<br>+ .max_len = 64,<br>+ .demod = XC3028_FE_ZARLINK456,<br>+ };<br>+<br>+ fe = dvb_attach(xc2028_attach, port->dvb.frontend,<br>+ &cfg);<br>+ if (fe != NULL && fe->ops.tuner_ops.set_config != NULL)<br>+ fe->ops.tuner_ops.set_config(fe, &ctl);<br>+ }<br>+ break;<br>+ default:<br> printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",<br> dev->name);<br> break;<br>diff -Naur v4l-dvb/linux/drivers/media/video/cx23885/cx23885.h v4l-dvb_dev/linux/drivers/media/video/cx23885/cx23885.h<br>--- v4l-dvb/linux/drivers/media/video/cx23885/cx23885.h 2008-06-09 14:13:21.000000000 +1000<br>+++ v4l-dvb_dev/linux/drivers/media/video/cx23885/cx23885.h 2008-06-30 21:06:19.000000000 +1000<br>@@ -67,6 +67,7 @@<br> #define CX23885_BOARD_HAUPPAUGE_HVR1700 8<br> #define CX23885_BOARD_HAUPPAUGE_HVR1400 9<br> #define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10<br>+#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11<br> <br> /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */<br> #define CX23885_NORMS (\<br>diff -Naur v4l-dvb/linux/drivers/media/video/cx23885/Kconfig v4l-dvb_dev/linux/drivers/media/video/cx23885/Kconfig<br>--- v4l-dvb/linux/drivers/media/video/cx23885/Kconfig 2008-05-15 19:47:08.000000000 +1000<br>+++ v4l-dvb_dev/linux/drivers/media/video/cx23885/Kconfig 2008-06-30 21:06:19.000000000 +1000<br>@@ -15,6 +15,7 @@<br> select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE<br> select DVB_S5H1409 if !DVB_FE_CUSTOMISE<br> select DVB_LGDT330X if !DVB_FE_CUSTOMISE<br>+ select DVB_ZL10353 if !DVB_FE_CUSTOMISE<br> select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE<br> select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE<br> select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE<br><br><BR>
--
<div> Be Yourself @ mail.com!<br>
Choose From 200+ Email Addresses<br>
Get a <b>Free</b> Account at <a href="http://www.mail.com/Product.aspx" target="_blank">www.mail.com</a>!</div>