1 files changed, 23 insertions, 1 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index d40232cda462..e11fa10a13a6 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -117,7 +117,10 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Hauppauge WinTV-HVR1500Q",
                 .portc          = CX23885_MPEG_DVB,
         },
-
+        [CX23885_BOARD_HAUPPAUGE_HVR1500] = {
+                .name           = "Hauppauge WinTV-HVR1500",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -153,6 +156,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x0070,
                 .subdevice = 0x7797,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x7717,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1500,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -214,6 +221,18 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 /* GPIO-0 cx24227 demodulator reset */
                 cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */
                 break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1500:
+                /* GPIO-0 cx24227 demodulator */
+                /* GPIO-2 xc3028 tuner */
+
+                /* Put the parts into reset */
+                cx_set(GP0_IO, 0x00050000);
+                cx_clear(GP0_IO, 0x00000005);
+                msleep(5);
+
+                /* Bring the parts out of reset */
+                cx_set(GP0_IO, 0x00050005);
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
                 /* GPIO-0 cx24227 demodulator reset */
                 /* GPIO-2 xc5000 tuner reset */
@@ -236,6 +255,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
 {
         switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
+        case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
                 /* FIXME: Implement me */
@@ -260,6 +280,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 
         switch (dev->board) {
         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:
@@ -275,6 +296,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts1->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: