lkml.org 
[lkml]   [2018]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 144/165] media: em28xx: Add Hauppauge SoloHD/DualHD bulk models
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Brad Love <brad@nextdimension.cc>

    [ Upstream commit f2a326c928cca1f5e36a3dceaf66e8c6b34e9cb8 ]

    Add additional pids to driver list

    Signed-off-by: Brad Love <brad@nextdimension.cc>
    Reviewed-by: Michael Ira Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/usb/em28xx/em28xx-cards.c | 22 +++++++++++++++++-----
    1 file changed, 17 insertions(+), 5 deletions(-)

    --- a/drivers/media/usb/em28xx/em28xx-cards.c
    +++ b/drivers/media/usb/em28xx/em28xx-cards.c
    @@ -508,8 +508,10 @@ static struct em28xx_reg_seq plex_px_bcu
    };

    /*
    - * 2040:0265 Hauppauge WinTV-dualHD DVB
    - * 2040:026d Hauppauge WinTV-dualHD ATSC/QAM
    + * 2040:0265 Hauppauge WinTV-dualHD DVB Isoc
    + * 2040:8265 Hauppauge WinTV-dualHD DVB Bulk
    + * 2040:026d Hauppauge WinTV-dualHD ATSC/QAM Isoc
    + * 2040:826d Hauppauge WinTV-dualHD ATSC/QAM Bulk
    * reg 0x80/0x84:
    * GPIO_0: Yellow LED tuner 1, 0=on, 1=off
    * GPIO_1: Green LED tuner 1, 0=on, 1=off
    @@ -2392,7 +2394,8 @@ struct em28xx_board em28xx_boards[] = {
    .has_dvb = 1,
    },
    /*
    - * 2040:0265 Hauppauge WinTV-dualHD (DVB version).
    + * 2040:0265 Hauppauge WinTV-dualHD (DVB version) Isoc.
    + * 2040:8265 Hauppauge WinTV-dualHD (DVB version) Bulk.
    * Empia EM28274, 2x Silicon Labs Si2168, 2x Silicon Labs Si2157
    */
    [EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB] = {
    @@ -2407,7 +2410,8 @@ struct em28xx_board em28xx_boards[] = {
    .leds = hauppauge_dualhd_leds,
    },
    /*
    - * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM).
    + * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Isoc.
    + * 2040:826d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Bulk.
    * Empia EM28274, 2x LG LGDT3306A, 2x Silicon Labs Si2157
    */
    [EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595] = {
    @@ -2548,8 +2552,12 @@ struct usb_device_id em28xx_id_table[] =
    .driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 },
    { USB_DEVICE(0x2040, 0x0265),
    .driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB },
    + { USB_DEVICE(0x2040, 0x8265),
    + .driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB },
    { USB_DEVICE(0x2040, 0x026d),
    .driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 },
    + { USB_DEVICE(0x2040, 0x826d),
    + .driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 },
    { USB_DEVICE(0x0438, 0xb002),
    .driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },
    { USB_DEVICE(0x2001, 0xf112),
    @@ -2610,7 +2618,11 @@ struct usb_device_id em28xx_id_table[] =
    .driver_info = EM28178_BOARD_PCTV_461E },
    { USB_DEVICE(0x2013, 0x025f),
    .driver_info = EM28178_BOARD_PCTV_292E },
    - { USB_DEVICE(0x2040, 0x0264), /* Hauppauge WinTV-soloHD */
    + { USB_DEVICE(0x2040, 0x0264), /* Hauppauge WinTV-soloHD Isoc */
    + .driver_info = EM28178_BOARD_PCTV_292E },
    + { USB_DEVICE(0x2040, 0x8264), /* Hauppauge OEM Generic WinTV-soloHD Bulk */
    + .driver_info = EM28178_BOARD_PCTV_292E },
    + { USB_DEVICE(0x2040, 0x8268), /* Hauppauge Retail WinTV-soloHD Bulk */
    .driver_info = EM28178_BOARD_PCTV_292E },
    { USB_DEVICE(0x0413, 0x6f07),
    .driver_info = EM2861_BOARD_LEADTEK_VC100 },

    \
     
     \ /
      Last update: 2018-05-24 11:59    [W:4.149 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site