V4L/DVB (7007): cx23885: Add basic video support for the HVR1800

This enabled basic preview NTSC and PAL support for the HVR1800.

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

1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index a4bac43cf9f5..c2d5a4d7228b 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <media/cx25840.h>
 
 #include "cx23885.h"
 
@@ -71,23 +72,29 @@ struct cx23885_board cx23885_boards[] = {
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1800] = {
                 .name           = "Hauppauge WinTV-HVR1800",
+                .porta          = CX23885_ANALOG_VIDEO,
                 .portc          = CX23885_MPEG_DVB,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .tuner_addr     = 0x42, /* 0x84 >> 1 */
                 .input          = {{
                         .type   = CX23885_VMUX_TELEVISION,
-                        .vmux   = 0,
-                        .gpio0  = 0xff00,
-                },{
-                        .type   = CX23885_VMUX_DEBUG,
-                        .vmux   = 0,
-                        .gpio0  = 0xff01,
+                        .vmux   =       CX25840_VIN7_CH3 |
+                                        CX25840_VIN5_CH2 |
+                                        CX25840_VIN2_CH1,
+                        .gpio0  = 0,
                 },{
                         .type   = CX23885_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                        .gpio0  = 0xff02,
+                        .vmux   =       CX25840_VIN7_CH3 |
+                                        CX25840_VIN4_CH2 |
+                                        CX25840_VIN6_CH1,
+                        .gpio0  = 0,
                 },{
                         .type   = CX23885_VMUX_SVIDEO,
-                        .vmux   = 2,
-                        .gpio0  = 0xff02,
+                        .vmux   =       CX25840_VIN7_CH3 |
+                                        CX25840_VIN4_CH2 |
+                                        CX25840_VIN8_CH1 |
+                                        CX25840_SVIDEO_ON,
+                        .gpio0  = 0,
                 }},
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1250] = {