V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800

cx23885: Enable cx23417 support on the HVR1800

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 21 insertions, 1 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 0f4b325f2d89..6ebf58724a01 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -73,6 +73,7 @@ struct cx23885_board cx23885_boards[] = {
         [CX23885_BOARD_HAUPPAUGE_HVR1800] = {
                 .name           = "Hauppauge WinTV-HVR1800",
                 .porta          = CX23885_ANALOG_VIDEO,
+                .portb          = CX23885_MPEG_ENCODER,
                 .portc          = CX23885_MPEG_DVB,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .tuner_addr     = 0x42, /* 0x84 >> 1 */
@@ -336,6 +337,10 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 /* GPIO-15-18 cx23417 READY, CS, RD, WR */
                 /* GPIO-19 IR_RX */
 
+                /* CX23417 GPIO's */
+                /* EIO15 Zilog Reset */
+                /* EIO14 S5H1409/CX24227 Reset */
+
                 /* Force the TDA8295A into reset and back */
                 cx_set(GP0_IO, 0x00040004);
                 mdelay(20);
@@ -443,10 +448,25 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1800:
+                /* Defaults for VID B - Analog encoder */
+                /* DREQ_POL, SMODE, PUNC_CLK, MCLK_POL Serial bus + punc clk */
+                ts1->gen_ctrl_val    = 0x10e;
+                ts1->ts_clk_en_val   = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val     = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+
+                /* APB_TSVALERR_POL (active low)*/
+                ts1->vld_misc_val    = 0x2000;
+                ts1->hw_sop_ctrl_val = (0x47 << 16 | 188 << 4 | 0xc);
+
+                /* Defaults for VID C */
+                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
+                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-        case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1200:
         case CX23885_BOARD_HAUPPAUGE_HVR1700: