1 files changed, 44 insertions, 5 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 69fcea82d01c..4e37375decf5 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -100,6 +100,13 @@ static struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = {
         { -1,                   -1,     -1,             -1},
 };
 
+/* Board Hauppauge WinTV HVR 900 (R2) digital */
+static struct em28xx_reg_seq hauppauge_wintv_hvr_900R2_digital[] = {
+        {EM28XX_R08_GPIO,       0x2e,   ~EM_GPIO_4,     10},
+        {EM2880_R04_GPO,        0x0c,   0x0f,           10},
+        { -1,                   -1,     -1,             -1},
+};
+
 /* Boards - EM2880 MSI DIGIVOX AD and EM2880_BOARD_MSI_DIGIVOX_AD_II */
 static struct em28xx_reg_seq em2880_msi_digivox_ad_analog[] = {
         {EM28XX_R08_GPIO,       0x69,   ~EM_GPIO_4,      10},
@@ -282,6 +289,16 @@ static struct em28xx_reg_seq leadership_reset[] = {
         {       -1,             -1,     -1,     -1},
 };
 
+/* 2013:024f PCTV Systems nanoStick T2 290e
+ * GPIO_6 - demod reset
+ * GPIO_7 - LED
+ */
+static struct em28xx_reg_seq pctv_290e[] = {
+        {EM2874_R80_GPIO,       0x00,   0xff,           80},
+        {EM2874_R80_GPIO,       0x40,   0xff,           80}, /* GPIO_6 = 1 */
+        {EM2874_R80_GPIO,       0xc0,   0xff,           80}, /* GPIO_7 = 1 */
+        {-1,                    -1,     -1,             -1},
+};
 
 /*
  *  Board definitions
@@ -859,6 +876,8 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .mts_firmware = 1,
+                .has_dvb      = 1,
+                .dvb_gpio     = hauppauge_wintv_hvr_900R2_digital,
                 .ir_codes     = RC_MAP_HAUPPAUGE,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
@@ -1448,12 +1467,14 @@ struct em28xx_board em28xx_boards[] = {
                         .gpio     = pinnacle_hybrid_pro_analog,
                 } },
         },
-        [EM2882_BOARD_PINNACLE_HYBRID_PRO] = {
-                .name         = "Pinnacle Hybrid Pro (2)",
-                .valid        = EM28XX_BOARD_NOT_VALIDATED,
+        [EM2882_BOARD_PINNACLE_HYBRID_PRO_330E] = {
+                .name         = "Pinnacle Hybrid Pro (330e)",
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .mts_firmware = 1,
+                .has_dvb      = 1,
+                .dvb_gpio     = hauppauge_wintv_hvr_900R2_digital,
+                .ir_codes     = RC_MAP_PINNACLE_PCTV_HD,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1749,6 +1770,17 @@ struct em28xx_board em28xx_boards[] = {
                 .dvb_gpio   = kworld_a340_digital,
                 .tuner_gpio = default_tuner_gpio,
         },
+        /* 2013:024f PCTV Systems nanoStick T2 290e.
+         * Empia EM28174, Sony CXD2820R and NXP TDA18271HD/C2 */
+        [EM28174_BOARD_PCTV_290E] = {
+                .i2c_speed      = EM2874_I2C_SECONDARY_BUS_SELECT |
+                        EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_FREQ_100_KHZ,
+                .xclk          = EM28XX_XCLK_FREQUENCY_12MHZ,
+                .name          = "PCTV Systems nanoStick T2 290e",
+                .tuner_type    = TUNER_ABSENT,
+                .tuner_gpio    = pctv_290e,
+                .has_dvb       = 1,
+        },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -1863,7 +1895,7 @@ struct usb_device_id em28xx_id_table[] = {
         { USB_DEVICE(0x2304, 0x021a),
                         .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
         { USB_DEVICE(0x2304, 0x0226),
-                        .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO },
+                        .driver_info = EM2882_BOARD_PINNACLE_HYBRID_PRO_330E },
         { USB_DEVICE(0x2304, 0x0227),
                         .driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },
         { USB_DEVICE(0x0413, 0x6023),
@@ -1876,6 +1908,8 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM2860_BOARD_GADMEI_UTV330 },
         { USB_DEVICE(0x1b80, 0xa340),
                         .driver_info = EM2870_BOARD_KWORLD_A340 },
+        { USB_DEVICE(0x2013, 0x024f),
+                        .driver_info = EM28174_BOARD_PCTV_290E },
         { },
 };
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
@@ -2229,7 +2263,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
                 ctl->demod = XC3028_FE_ZARLINK456;
                 break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
-                /* djh - Not sure which demod we need here */
+        case EM2882_BOARD_PINNACLE_HYBRID_PRO_330E:
                 ctl->demod = XC3028_FE_DEFAULT;
                 break;
         case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
@@ -2799,6 +2833,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                         dev->reg_gpio_num = EM2874_R80_GPIO;
                         dev->wait_after_write = 0;
                         break;
+                case CHIP_ID_EM28174:
+                        em28xx_info("chip ID is em28174\n");
+                        dev->reg_gpio_num = EM2874_R80_GPIO;
+                        dev->wait_after_write = 0;
+                        break;
                 case CHIP_ID_EM2883:
                         em28xx_info("chip ID is em2882/em2883\n");
                         dev->wait_after_write = 0;