Merge branch 'linus' into x86/pat

[linux-2.6-omap-h63xx.git] / drivers / media / video / usbvision / usbvision-cards.c

diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 51ab265d566ac29154c9234d3c7d60167a7fa482..503b13beb922451185a268fcb290bcfbd4b97667 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -79,7 +79,7 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .Interface     = -1,
                .Codec         = CODEC_SAA7113,
                .VideoChannels = 2,
-               .VideoNorm     = V4L2_STD_PAL,
+               .VideoNorm     = V4L2_STD_NTSC,
                .AudioChannels = 1,
                .Radio         = 0,
                .vbi           = 1,
@@ -311,8 +311,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_SECAM,
-               .X_Offset      = -1,
-               .Y_Offset      = -1,
+               .X_Offset      = 0x80,
+               .Y_Offset      = 0x16,
                .ModelString   = "Hauppauge WinTV USB (PAL/SECAM L)",
        },
        [HPG_WINTV_PAL_D_K] = {
@@ -586,7 +586,7 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .Radio         = 0,
                .vbi           = 1,
                .Tuner         = 1,
-               .TunerType     = TUNER_PHILIPS_PAL,
+               .TunerType     = TUNER_LG_PAL_NEW_TAPC,
                .X_Offset      = 0,
                .Y_Offset      = 3,
                .Dvi_yuv_override = 1,
@@ -901,6 +901,20 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .Y_Offset      = -1,
                .ModelString   = "Pinnacle Studio PCTV USB (NTSC) FM",
        },
+       [PINNA_PCTV_USB_NTSC_FM_V3] = {
+               .Interface     = -1,
+               .Codec         = CODEC_SAA7111,
+               .VideoChannels = 3,
+               .VideoNorm     = V4L2_STD_NTSC,
+               .AudioChannels = 1,
+               .Radio         = 1,
+               .vbi           = 1,
+               .Tuner         = 1,
+               .TunerType     = TUNER_PHILIPS_NTSC_M,
+               .X_Offset      = -1,
+               .Y_Offset      = -1,
+               .ModelString   = "Pinnacle Studio PCTV USB (NTSC) FM V3",
+       },
        [PINNA_PCTV_USB_PAL_FM_V2] = {
                .Interface     = -1,
                .Codec         = CODEC_SAA7113,
@@ -1044,7 +1058,7 @@ struct usb_device_id usbvision_table [] = {
        { USB_DEVICE(0x0573, 0x4d2a), .driver_info=HPG_WINTV_PRO_NTSC_MN },
        { USB_DEVICE(0x0573, 0x4d2b), .driver_info=HPG_WINTV_PRO_NTSC_MN_V2 },
        { USB_DEVICE(0x0573, 0x4d2c), .driver_info=HPG_WINTV_PRO_PAL },
-       { USB_DEVICE(0x0573, 0x4d20), .driver_info=HPG_WINTV_PRO_NTSC_MN_V3 },
+       { USB_DEVICE(0x0573, 0x4d20), .driver_info = HPG_WINTV_PRO_NTSC_MN_V3 },
        { USB_DEVICE(0x0573, 0x4d21), .driver_info=HPG_WINTV_PRO_PAL_BG },
        { USB_DEVICE(0x0573, 0x4d22), .driver_info=HPG_WINTV_PRO_PAL_I },
        { USB_DEVICE(0x0573, 0x4d23), .driver_info=HPG_WINTV_PRO_PAL_SECAM_L },
@@ -1074,6 +1088,8 @@ struct usb_device_id usbvision_table [] = {
        { USB_DEVICE(0x2304, 0x0110), .driver_info=PINNA_PCTV_USB_PAL_FM },
        { USB_DEVICE(0x2304, 0x0111), .driver_info=MIRO_PCTV_USB },
        { USB_DEVICE(0x2304, 0x0112), .driver_info=PINNA_PCTV_USB_NTSC_FM },
+       { USB_DEVICE(0x2304, 0x0113),
+         .driver_info = PINNA_PCTV_USB_NTSC_FM_V3 },
        { USB_DEVICE(0x2304, 0x0210), .driver_info=PINNA_PCTV_USB_PAL_FM_V2 },
        { USB_DEVICE(0x2304, 0x0212), .driver_info=PINNA_PCTV_USB_NTSC_FM_V2 },
        { USB_DEVICE(0x2304, 0x0214), .driver_info=PINNA_PCTV_USB_PAL_FM_V3 },
@@ -1081,6 +1097,7 @@ struct usb_device_id usbvision_table [] = {
        { USB_DEVICE(0x2304, 0x0301), .driver_info=PINNA_LINX_VD_IN_CAB_PAL },
        { USB_DEVICE(0x2304, 0x0419), .driver_info=PINNA_PCTV_BUNGEE_PAL_FM },
        { USB_DEVICE(0x2400, 0x4200), .driver_info=HPG_WINTV },
+       { },    /* terminate list */
 };
 
 MODULE_DEVICE_TABLE (usb, usbvision_table);