1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 90d0ad63d99..68ac04b7f1e 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -185,6 +185,10 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Hauppauge WinTV-HVR1270",
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_HAUPPAUGE_HVR1275] = {
+                .name           = "Hauppauge WinTV-HVR1275",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -288,6 +292,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x0070,
                 .subdevice = 0x2211,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1270,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x2215,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -628,12 +636,14 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
+        case CX23885_BOARD_HAUPPAUGE_HVR1275:
+                /* GPIO-5 RF Control: 0 = RF1 Terrestrial, 1 = RF2 Cable */
                 /* GPIO-6 I2C Gate which can isolate the 3305 from the bus */
                 /* GPIO-9 LG3305 reset */
 
                 /* Put the parts into reset and back */
-                cx23885_gpio_enable(dev, GPIO_9 | GPIO_6, 1);
-                cx23885_gpio_set(dev, GPIO_9 | GPIO_6);
+                cx23885_gpio_enable(dev, GPIO_9 | GPIO_6 | GPIO_5, 1);
+                cx23885_gpio_set(dev, GPIO_9 | GPIO_6 | GPIO_5);
                 cx23885_gpio_clear(dev, GPIO_9);
                 mdelay(20);
                 cx23885_gpio_set(dev, GPIO_9);
@@ -651,6 +661,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1200:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
+        case CX23885_BOARD_HAUPPAUGE_HVR1275:
                 /* FIXME: Implement me */
                 break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
@@ -687,6 +698,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1200:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
+        case CX23885_BOARD_HAUPPAUGE_HVR1275:
                 if (dev->i2c_bus[0].i2c_rc == 0)
                         hauppauge_eeprom(dev, eeprom+0xc0);
                 break;
@@ -745,6 +757,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
+        case CX23885_BOARD_HAUPPAUGE_HVR1275:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */