1 files changed, 200 insertions, 22 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 7c70738479dd..00cc791a9e44 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -49,6 +49,11 @@ static unsigned int disable_ir;
 module_param(disable_ir, int, 0444);
 MODULE_PARM_DESC(disable_ir, "disable infrared remote support");
 
+static unsigned int disable_usb_speed_check;
+module_param(disable_usb_speed_check, int, 0444);
+MODULE_PARM_DESC(disable_usb_speed_check,
+                 "override min bandwidth requirement of 480M bps");
+
 static unsigned int card[]     = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
 module_param_array(card,  int, NULL, 0444);
 MODULE_PARM_DESC(card,     "card type");
@@ -104,6 +109,24 @@ static struct em28xx_reg_seq em2880_msi_digivox_ad_analog[] = {
 /* Board  - EM2870 Kworld 355u
    Analog - No input analog */
 
+/* Board - EM2882 Kworld 315U digital */
+static struct em28xx_reg_seq em2882_kworld_315u_digital[] = {
+        {EM28XX_R08_GPIO,       0xff,   0xff,           10},
+        {EM28XX_R08_GPIO,       0xfe,   0xff,           10},
+        {EM2880_R04_GPO,        0x04,   0xff,           10},
+        {EM2880_R04_GPO,        0x0c,   0xff,           10},
+        {EM28XX_R08_GPIO,       0x7e,   0xff,           10},
+        {  -1,                  -1,     -1,             -1},
+};
+
+static struct em28xx_reg_seq em2882_kworld_315u_tuner_gpio[] = {
+        {EM2880_R04_GPO,        0x08,   0xff,           10},
+        {EM2880_R04_GPO,        0x0c,   0xff,           10},
+        {EM2880_R04_GPO,        0x08,   0xff,           10},
+        {EM2880_R04_GPO,        0x0c,   0xff,           10},
+        {  -1,                  -1,     -1,             -1},
+};
+
 static struct em28xx_reg_seq kworld_330u_analog[] = {
         {EM28XX_R08_GPIO,       0x6d,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x00,   0xff,           10},
@@ -140,6 +163,16 @@ static struct em28xx_reg_seq compro_mute_gpio[] = {
         {  -1,                  -1,             -1,             -1},
 };
 
+/* Terratec AV350 */
+static struct em28xx_reg_seq terratec_av350_mute_gpio[] = {
+        {EM28XX_R08_GPIO,       0xff,   0x7f,           10},
+        {       -1,             -1,     -1,             -1},
+};
+
+static struct em28xx_reg_seq terratec_av350_unmute_gpio[] = {
+        {EM28XX_R08_GPIO,       0xff,   0xff,           10},
+        {       -1,             -1,     -1,             -1},
+};
 /*
  *  Board definitions
  */
@@ -992,16 +1025,17 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_LINE_IN,
                 } },
         },
-        [EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA] = {
-                .name                = "PointNix Intra-Oral Camera",
+        [EM2860_BOARD_SAA711X_REFERENCE_DESIGN] = {
+                .name                = "EM2860/SAA711X Reference Design",
                 .has_snapshot_button = 1,
-                .tda9887_conf        = TDA9887_PRESENT,
                 .tuner_type          = TUNER_ABSENT,
                 .decoder             = EM28XX_SAA711X,
                 .input               = { {
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = SAA7115_SVIDEO3,
-                        .amux     = EM28XX_AMUX_VIDEO,
+                }, {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
                 } },
         },
         [EM2880_BOARD_MSI_DIGIVOX_AD] = {
@@ -1095,6 +1129,63 @@ struct em28xx_board em28xx_boards[] = {
                         .gpio     = default_analog,
                 } },
         },
+        [EM2882_BOARD_KWORLD_ATSC_315U] = {
+                .name           = "KWorld ATSC 315U HDTV TV Box",
+                .valid          = EM28XX_BOARD_NOT_VALIDATED,
+                .tuner_type     = TUNER_THOMSON_DTT761X,
+                .tuner_gpio     = em2882_kworld_315u_tuner_gpio,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .decoder        = EM28XX_SAA711X,
+                .has_dvb        = 1,
+                .dvb_gpio       = em2882_kworld_315u_digital,
+                .xclk           = EM28XX_XCLK_FREQUENCY_12MHZ,
+                .i2c_speed      = EM28XX_I2C_CLK_WAIT_ENABLE,
+                /* Analog mode - still not ready */
+                /*.input        = { {
+                        .type = EM28XX_VMUX_TELEVISION,
+                        .vmux = SAA7115_COMPOSITE2,
+                        .amux = EM28XX_AMUX_VIDEO,
+                        .gpio = em2882_kworld_315u_analog,
+                        .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
+                }, {
+                        .type = EM28XX_VMUX_COMPOSITE1,
+                        .vmux = SAA7115_COMPOSITE0,
+                        .amux = EM28XX_AMUX_LINE_IN,
+                        .gpio = em2882_kworld_315u_analog1,
+                        .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
+                }, {
+                        .type = EM28XX_VMUX_SVIDEO,
+                        .vmux = SAA7115_SVIDEO3,
+                        .amux = EM28XX_AMUX_LINE_IN,
+                        .gpio = em2882_kworld_315u_analog1,
+                        .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
+                } }, */
+        },
+        [EM2880_BOARD_EMPIRE_DUAL_TV] = {
+                .name = "Empire dual TV",
+                .tuner_type = TUNER_XC2028,
+                .tuner_gpio = default_tuner_gpio,
+                .has_dvb = 1,
+                .dvb_gpio = default_digital,
+                .mts_firmware = 1,
+                .decoder = EM28XX_TVP5150,
+                .input = { {
+                        .type = EM28XX_VMUX_TELEVISION,
+                        .vmux = TVP5150_COMPOSITE0,
+                        .amux = EM28XX_AMUX_VIDEO,
+                        .gpio = default_analog,
+                }, {
+                        .type = EM28XX_VMUX_COMPOSITE1,
+                        .vmux = TVP5150_COMPOSITE1,
+                        .amux = EM28XX_AMUX_LINE_IN,
+                        .gpio = default_analog,
+                }, {
+                        .type = EM28XX_VMUX_SVIDEO,
+                        .vmux = TVP5150_SVIDEO,
+                        .amux = EM28XX_AMUX_LINE_IN,
+                        .gpio = default_analog,
+                } },
+        },
         [EM2881_BOARD_DNT_DA2_HYBRID] = {
                 .name         = "DNT DA2 Hybrid",
                 .valid        = EM28XX_BOARD_NOT_VALIDATED,
@@ -1322,6 +1413,42 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_VIDEO,
                 } },
         },
+        [EM2860_BOARD_TERRATEC_GRABBY] = {
+                .name            = "Terratec Grabby",
+                .vchannels       = 2,
+                .tuner_type      = TUNER_ABSENT,
+                .decoder         = EM28XX_SAA711X,
+                .xclk            = EM28XX_XCLK_FREQUENCY_12MHZ,
+                .input           = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = SAA7115_COMPOSITE0,
+                        .amux     = EM28XX_AMUX_VIDEO2,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = SAA7115_SVIDEO3,
+                        .amux     = EM28XX_AMUX_VIDEO2,
+                } },
+        },
+        [EM2860_BOARD_TERRATEC_AV350] = {
+                .name            = "Terratec AV350",
+                .vchannels       = 2,
+                .tuner_type      = TUNER_ABSENT,
+                .decoder         = EM28XX_TVP5150,
+                .xclk            = EM28XX_XCLK_FREQUENCY_12MHZ,
+                .mute_gpio       = terratec_av350_mute_gpio,
+                .input           = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = EM28XX_AUDIO_SRC_LINE,
+                        .gpio     = terratec_av350_unmute_gpio,
+
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = EM28XX_AUDIO_SRC_LINE,
+                        .gpio     = terratec_av350_unmute_gpio,
+                } },
+        },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -1355,6 +1482,8 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM2880_BOARD_KWORLD_DVB_305U },
         { USB_DEVICE(0xeb1a, 0xe310),
                         .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD },
+        { USB_DEVICE(0xeb1a, 0xa313),
+                .driver_info = EM2882_BOARD_KWORLD_ATSC_315U },
         { USB_DEVICE(0xeb1a, 0xa316),
                         .driver_info = EM2883_BOARD_KWORLD_HYBRID_330U },
         { USB_DEVICE(0xeb1a, 0xe320),
@@ -1385,6 +1514,10 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM2870_BOARD_TERRATEC_XS },
         { USB_DEVICE(0x0ccd, 0x0047),
                         .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
+        { USB_DEVICE(0x0ccd, 0x0084),
+                        .driver_info = EM2860_BOARD_TERRATEC_AV350 },
+        { USB_DEVICE(0x0ccd, 0x0096),
+                        .driver_info = EM2860_BOARD_TERRATEC_GRABBY },
         { USB_DEVICE(0x185b, 0x2870),
                         .driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },
         { USB_DEVICE(0x185b, 0x2041),
@@ -1437,13 +1570,14 @@ static struct em28xx_hash_table em28xx_eeprom_hash[] = {
         {0x6ce05a8f, EM2820_BOARD_PROLINK_PLAYTV_USB2, TUNER_YMEC_TVF_5533MF},
         {0x72cc5a8b, EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2, TUNER_YMEC_TVF_5533MF},
         {0x966a0441, EM2880_BOARD_KWORLD_DVB_310U, TUNER_XC2028},
+        {0x9567eb1a, EM2880_BOARD_EMPIRE_DUAL_TV, TUNER_XC2028},
 };
 
 /* I2C devicelist hash table for devices with generic USB IDs */
 static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC},
         {0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},
-        {0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT},
+        {0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},
         {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 };
 
@@ -1619,6 +1753,17 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                 em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xfd);
                 break;
 
+        case EM2882_BOARD_KWORLD_ATSC_315U:
+                em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xff);
+                msleep(10);
+                em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xfe);
+                msleep(10);
+                em28xx_write_reg(dev, EM2880_R04_GPO, 0x00);
+                msleep(10);
+                em28xx_write_reg(dev, EM2880_R04_GPO, 0x08);
+                msleep(10);
+                break;
+
         case EM2860_BOARD_KAIOMY_TVNPC_U2:
                 em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x07", 1);
                 em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, "\x40", 1);
@@ -1664,6 +1809,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
         ctl->mts = em28xx_boards[dev->model].mts_firmware;
 
         switch (dev->model) {
+        case EM2880_BOARD_EMPIRE_DUAL_TV:
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
                 ctl->demod = XC3028_FE_ZARLINK456;
                 break;
@@ -1835,12 +1981,20 @@ static int em28xx_hint_board(struct em28xx *dev)
 }
 
 /* ----------------------------------------------------------------------- */
-void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
+void em28xx_register_i2c_ir(struct em28xx *dev)
 {
-        if (disable_ir) {
-                ir->get_key = NULL;
-                return ;
-        }
+        struct i2c_board_info info;
+        struct IR_i2c_init_data init_data;
+        const unsigned short addr_list[] = {
+                 0x30, 0x47, I2C_CLIENT_END
+        };
+
+        if (disable_ir)
+                return;
+
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        memset(&init_data, 0, sizeof(struct IR_i2c_init_data));
+        strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
 
         /* detect & configure */
         switch (dev->model) {
@@ -1850,22 +2004,19 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
                 break;
         case (EM2800_BOARD_TERRATEC_CINERGY_200):
         case (EM2820_BOARD_TERRATEC_CINERGY_250):
-                ir->ir_codes = ir_codes_em_terratec;
-                ir->get_key = em28xx_get_key_terratec;
-                snprintf(ir->c.name, sizeof(ir->c.name),
-                         "i2c IR (EM28XX Terratec)");
+                init_data.ir_codes = ir_codes_em_terratec;
+                init_data.get_key = em28xx_get_key_terratec;
+                init_data.name = "i2c IR (EM28XX Terratec)";
                 break;
         case (EM2820_BOARD_PINNACLE_USB_2):
-                ir->ir_codes = ir_codes_pinnacle_grey;
-                ir->get_key = em28xx_get_key_pinnacle_usb_grey;
-                snprintf(ir->c.name, sizeof(ir->c.name),
-                         "i2c IR (EM28XX Pinnacle PCTV)");
+                init_data.ir_codes = ir_codes_pinnacle_grey;
+                init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
+                init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
-                ir->ir_codes = ir_codes_hauppauge_new;
-                ir->get_key = em28xx_get_key_em_haup;
-                snprintf(ir->c.name, sizeof(ir->c.name),
-                         "i2c IR (EM2840 Hauppauge)");
+                init_data.ir_codes = ir_codes_hauppauge_new;
+                init_data.get_key = em28xx_get_key_em_haup;
+                init_data.name = "i2c IR (EM2840 Hauppauge)";
                 break;
         case (EM2820_BOARD_MSI_VOX_USB_2):
                 break;
@@ -1876,6 +2027,10 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
         case (EM2800_BOARD_GRABBEEX_USB2800):
                 break;
         }
+
+        if (init_data.name)
+                info.platform_data = &init_data;
+        i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
 }
 
 void em28xx_card_setup(struct em28xx *dev)
@@ -1886,6 +2041,9 @@ void em28xx_card_setup(struct em28xx *dev)
         if (em28xx_boards[dev->model].tuner_addr)
                 dev->tuner_addr = em28xx_boards[dev->model].tuner_addr;
 
+        if (em28xx_boards[dev->model].tda9887_conf)
+                dev->tda9887_conf = em28xx_boards[dev->model].tda9887_conf;
+
         /* request some modules */
         switch (dev->model) {
         case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
@@ -1915,6 +2073,12 @@ void em28xx_card_setup(struct em28xx *dev)
 #endif
                 break;
         }
+        case EM2882_BOARD_KWORLD_ATSC_315U:
+                em28xx_write_reg(dev, 0x0d, 0x42);
+                msleep(10);
+                em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xfd);
+                msleep(10);
+                break;
         case EM2820_BOARD_KWORLD_PVRTV2800RF:
                 /* GPIO enables sound on KWORLD PVR TV 2800RF */
                 em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xf9);
@@ -2279,6 +2443,20 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 ifnum,
                 interface->altsetting->desc.bInterfaceNumber);
 
+        /*
+         * Make sure we have 480 Mbps of bandwidth, otherwise things like
+         * video stream wouldn't likely work, since 12 Mbps is generally
+         * not enough even for most Digital TV streams.
+         */
+        if (udev->speed != USB_SPEED_HIGH && disable_usb_speed_check == 0) {
+                printk(DRIVER_NAME ": Device initialization failed.\n");
+                printk(DRIVER_NAME ": Device must be connected to a high-speed"
+                       " USB 2.0 port.\n");
+                em28xx_devused &= ~(1<<nr);
+                retval = -ENODEV;
+                goto err;
+        }
+
         if (nr >= EM28XX_MAXBOARDS) {
                 printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
                                 EM28XX_MAXBOARDS);