V4L/DVB (11767): cx23885: Add preliminary support for the HVR1270

[deliverable/linux.git] / drivers / media / video / cx23885 / cx23885-cards.c

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 6d6293f7d428e6fe501f2c2b4d3d02727dc1132a..49c6634c63276a9c4a339870c0ce8f198a2368be 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -181,6 +181,9 @@ struct cx23885_board cx23885_boards[] = {
                .portb          = CX23885_MPEG_DVB,
                .portc          = CX23885_MPEG_DVB,
        },
+       [CX23885_BOARD_HAUPPAUGE_HVR1270] = {
+               .name           = "Hauppauge WinTV-HVR1270",
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -280,6 +283,10 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x1b55,
                .subdevice = 0x2a2c,
                .card      = CX23885_BOARD_NETUP_DUAL_DVBS2_CI,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x2211,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1270,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -619,6 +626,17 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                /* enable irq */
                cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/
                break;
+       case CX23885_BOARD_HAUPPAUGE_HVR1270:
+               /* 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_clear(dev, GPIO_9);
+               mdelay(20);
+               cx23885_gpio_set(dev, GPIO_9);
+               break;
        }
 }
 
@@ -631,6 +649,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1800:
        case CX23885_BOARD_HAUPPAUGE_HVR1200:
        case CX23885_BOARD_HAUPPAUGE_HVR1400:
+       case CX23885_BOARD_HAUPPAUGE_HVR1270:
                /* FIXME: Implement me */
                break;
        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
@@ -666,6 +685,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
        case CX23885_BOARD_HAUPPAUGE_HVR1200:
        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+       case CX23885_BOARD_HAUPPAUGE_HVR1270:
                if (dev->i2c_bus[0].i2c_rc == 0)
                        hauppauge_eeprom(dev, eeprom+0xc0);
                break;
@@ -723,6 +743,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1400:
        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
+       case CX23885_BOARD_HAUPPAUGE_HVR1270:
        default:
                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */