1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 8bb3fe4a876c..e6d34fb5b943 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -88,6 +88,27 @@ struct cx23885_board cx23885_boards[] = {
                         .gpio0  = 0xff02,
                 }},
         },
+        [CX23885_BOARD_HAUPPAUGE_HVR1250] = {
+                .name           = "Hauppauge WinTV-HVR1250",
+                .portc          = CX23885_MPEG_DVB,
+                .input          = {{
+                        .type   = CX23885_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0xff00,
+                },{
+                        .type   = CX23885_VMUX_DEBUG,
+                        .vmux   = 0,
+                        .gpio0  = 0xff01,
+                },{
+                        .type   = CX23885_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0xff02,
+                },{
+                        .type   = CX23885_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0xff02,
+                }},
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -111,6 +132,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x0070,
                 .subdevice = 0x7801,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1800,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x7911,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1250,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -176,6 +201,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         }
 
         switch (dev->board) {
+        case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
                 if (dev->i2c_bus[0].i2c_rc == 0)