V4L/DVB (12306): cx23885: Add support for ATSC/QAM on Hauppauge HVR-1850

cx23885: Add support for ATSC/QAM on Hauppauge HVR-1850

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 19feb514f93d4b1977e0fcd309ad21bee1fd0f3c..525edb37c758859d59dfb0e2c95bcef8039ce07d 100644 (file)
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -22,3 +22,4 @@
  21 -> Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295]
  22 -> Mygica X8506 DMB-TH                                 [14f1:8651]
  23 -> Magic-Pro ProHDTV Extreme 2                         [14f1:8657]
+ 24 -> Hauppauge WinTV-HVR1850                             [0070:8541]

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 2bf8ed604d6b8547b70b949d9d769f73f80c79bc..3143d85ef31d03236345fd4ec7a7c9391942404a 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -205,6 +205,11 @@ struct cx23885_board cx23885_boards[] = {
                .name           = "Magic-Pro ProHDTV Extreme 2",
                .portb          = CX23885_MPEG_DVB,
        },
+       [CX23885_BOARD_HAUPPAUGE_HVR1850] = {
+               .name           = "Hauppauge WinTV-HVR1850",
+               .portb          = CX23885_MPEG_ENCODER,
+               .portc          = CX23885_MPEG_DVB,
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -332,6 +337,10 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x14f1,
                .subdevice = 0x8657,
                .card      = CX23885_BOARD_MAGICPRO_PROHDTVE2,
+       }, {
+               .subvendor = 0x0070,
+               .subdevice = 0x8541,
+               .card      = CX23885_BOARD_HAUPPAUGE_HVR1850,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -491,8 +500,13 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                /* WinTV-HVR1700 (PCIe, OEM, No IR, full height)
                 * DVB-T and MPEG2 HW Encoder */
                break;
+       case 85021:
+               /* WinTV-HVR1850 (PCIe, OEM, RCA in, IR, FM,
+                       Dual channel ATSC and MPEG2 HW Encoder */
+               break;
        default:
-               printk(KERN_WARNING "%s: warning: unknown hauppauge model #%d\n",
+               printk(KERN_WARNING "%s: warning: "
+                       "unknown hauppauge model #%d\n",
                        dev->name, tv.model);
                break;
        }
@@ -742,6 +756,36 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                cx_set(GP0_IO, 0x00060006);
                mdelay(100);
                break;
+       case CX23885_BOARD_HAUPPAUGE_HVR1850:
+               /* GPIO-0 656_CLK */
+               /* GPIO-1 656_D0 */
+               /* GPIO-2 Wake# */
+               /* GPIO-3-10 cx23417 data0-7 */
+               /* GPIO-11-14 cx23417 addr0-3 */
+               /* GPIO-15-18 cx23417 READY, CS, RD, WR */
+               /* GPIO-19 IR_RX */
+               /* GPIO-20 C_IR_TX */
+               /* GPIO-21 I2S DAT */
+               /* GPIO-22 I2S WCLK */
+               /* GPIO-23 I2S BCLK */
+               /* ALT GPIO: EXP GPIO LATCH */
+
+               /* CX23417 GPIO's */
+               /* GPIO-14 S5H1411/CX24228 Reset */
+               /* GPIO-13 EEPROM write protect */
+               mc417_gpio_enable(dev, GPIO_14 | GPIO_13, 1);
+
+               /* Put the demod into reset and protect the eeprom */
+               mc417_gpio_clear(dev, GPIO_14 | GPIO_13);
+               mdelay(100);
+
+               /* Bring the demod out of reset */
+               mc417_gpio_set(dev, GPIO_14);
+               mdelay(100);
+
+               /* CX24228 GPIO */
+               /* Connected to IF / Mux */
+               break;
        }
 }
 
@@ -758,6 +802,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1275:
        case CX23885_BOARD_HAUPPAUGE_HVR1255:
        case CX23885_BOARD_HAUPPAUGE_HVR1210:
+       case CX23885_BOARD_HAUPPAUGE_HVR1850:
                /* FIXME: Implement me */
                break;
        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
@@ -797,6 +842,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1275:
        case CX23885_BOARD_HAUPPAUGE_HVR1255:
        case CX23885_BOARD_HAUPPAUGE_HVR1210:
+       case CX23885_BOARD_HAUPPAUGE_HVR1850:
                if (dev->i2c_bus[0].i2c_rc == 0)
                        hauppauge_eeprom(dev, eeprom+0xc0);
                break;
@@ -864,6 +910,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1275:
        case CX23885_BOARD_HAUPPAUGE_HVR1255:
        case CX23885_BOARD_HAUPPAUGE_HVR1210:
+       case CX23885_BOARD_HAUPPAUGE_HVR1850:
        default:
                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index e4a22dcaf59bfd5454170ba3cef30b5672942616..f87a023a735100986a6d8997b56420900aef066a 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -866,6 +866,17 @@ static int dvb_register(struct cx23885_tsport *port)
                                &magicpro_prohdtve2_xc5000_config);
                }
                break;
+       case CX23885_BOARD_HAUPPAUGE_HVR1850:
+               i2c_bus = &dev->i2c_bus[0];
+               fe0->dvb.frontend = dvb_attach(s5h1411_attach,
+                       &hcw_s5h1411_config,
+                       &i2c_bus->i2c_adap);
+               if (fe0->dvb.frontend != NULL)
+                       dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                               0x60, &dev->i2c_bus[0].i2c_adap,
+                               &hauppauge_tda18271_config);
+               break;
+
        default:
                printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
                        " isn't supported yet\n",

diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 0958d6a7ffdd63305d294484768bd92fffeaa612..963e6b17a43ec0c688a7a959586cf5301666cbe5 100644 (file)
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -77,6 +77,7 @@
 #define CX23885_BOARD_HAUPPAUGE_HVR1210        21
 #define CX23885_BOARD_MYGICA_X8506             22
 #define CX23885_BOARD_MAGICPRO_PROHDTVE2       23
+#define CX23885_BOARD_HAUPPAUGE_HVR1850        24
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002