media: em28xx: Add Hauppauge USB Live2

New revision of Hauppauge USB Live2 switches from cx231xx usb bridge
to Empia em2828X bridge. Inputs for the USB Live2 remain the same:
- Composite video
- S-Video
- Analog stereo audio

Signed-off-by: Bradford Love <brad@nextdimension.cc>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 67266bddb7133dddc799539d4d2509625f3d1cd9..0c5851bf4ef0f0fb132d865fb18f7a4ba4862566 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2623,6 +2623,23 @@ const struct em28xx_board em28xx_boards[] = {
                        .gpio     = mygica_utv3_tuner_audio_gpio,
                } },
        },
+       [EM2828X_BOARD_HAUPPAUGE_USB_LIVE2] = {
+               .name         = "Hauppauge USB Live2",
+               .vchannels    = 2,
+               .tuner_type   = TUNER_ABSENT,
+               .has_dvb      = 0,
+               .decoder      = EM28XX_BUILTIN,
+               .i2c_speed    = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_FREQ_400_KHZ,
+               .input           = { {
+                       .type     = EM28XX_VMUX_COMPOSITE,
+                       .vmux     = 0,
+                       .amux     = EM28XX_AMUX_LINE_IN,
+               }, {
+                       .type     = EM28XX_VMUX_SVIDEO,
+                       .vmux     = 1,
+                       .amux     = EM28XX_AMUX_LINE_IN,
+               } },
+       },
 };
 EXPORT_SYMBOL_GPL(em28xx_boards);
 
@@ -2770,6 +2787,8 @@ struct usb_device_id em28xx_id_table[] = {
                        .driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 },
        { USB_DEVICE(0x2040, 0x846d),
                        .driver_info = EM2874_BOARD_HAUPPAUGE_USB_QUADHD },
+       { USB_DEVICE(0x2040, 0xc220),
+                       .driver_info = EM2828X_BOARD_HAUPPAUGE_USB_LIVE2 },
        { USB_DEVICE(0x0438, 0xb002),
                        .driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },
        { USB_DEVICE(0x2001, 0xf112),
@@ -3260,6 +3279,7 @@ static void em28xx_card_setup(struct em28xx *dev)
        case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
        case EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB:
        case EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595:
+       case EM2828X_BOARD_HAUPPAUGE_USB_LIVE2:
        {
                struct tveeprom tv;
 

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index b77357f71cf31146182b2df1bc62370caa556c6c..a4a91c0eb2fc28039972577813136c95686e0591 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -144,6 +144,7 @@
 #define EM2860_BOARD_MYGICA_IGRABBER              105
 #define EM2874_BOARD_HAUPPAUGE_USB_QUADHD         106
 #define EM2860_BOARD_MYGICA_UTV3                  107
+#define EM2828X_BOARD_HAUPPAUGE_USB_LIVE2         108
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4