lkml.org 
[lkml]   [2015]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 12/48] USB: option: add ZTE PIDs
    Date
    3.13.11-ckt29 -stable review patch.  If anyone has any objections, please let me know.

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

    From: "Liu.Zhao" <lzsos369@163.com>

    commit 19ab6bc5674a30fdb6a2436b068d19a3c17dc73e upstream.

    This is intended to add ZTE device PIDs on kernel.

    Signed-off-by: Liu.Zhao <lzsos369@163.com>
    [johan: sort the new entries ]
    Signed-off-by: Johan Hovold <johan@kernel.org>

    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/serial/option.c | 24 ++++++++++++++++++++++++
    1 file changed, 24 insertions(+)

    diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
    index e2cc293..2188cb8 100644
    --- a/drivers/usb/serial/option.c
    +++ b/drivers/usb/serial/option.c
    @@ -278,6 +278,10 @@ static void option_instat_callback(struct urb *urb);
    #define ZTE_PRODUCT_MF622 0x0001
    #define ZTE_PRODUCT_MF628 0x0015
    #define ZTE_PRODUCT_MF626 0x0031
    +#define ZTE_PRODUCT_ZM8620_X 0x0396
    +#define ZTE_PRODUCT_ME3620_MBIM 0x0426
    +#define ZTE_PRODUCT_ME3620_X 0x1432
    +#define ZTE_PRODUCT_ME3620_L 0x1433
    #define ZTE_PRODUCT_AC2726 0xfff1
    #define ZTE_PRODUCT_CDMA_TECH 0xfffe
    #define ZTE_PRODUCT_AC8710T 0xffff
    @@ -551,6 +555,18 @@ static const struct option_blacklist_info zte_mc2716_z_blacklist = {
    .sendsetup = BIT(1) | BIT(2) | BIT(3),
    };

    +static const struct option_blacklist_info zte_me3620_mbim_blacklist = {
    + .reserved = BIT(2) | BIT(3) | BIT(4),
    +};
    +
    +static const struct option_blacklist_info zte_me3620_xl_blacklist = {
    + .reserved = BIT(3) | BIT(4) | BIT(5),
    +};
    +
    +static const struct option_blacklist_info zte_zm8620_x_blacklist = {
    + .reserved = BIT(3) | BIT(4) | BIT(5),
    +};
    +
    static const struct option_blacklist_info huawei_cdc12_blacklist = {
    .reserved = BIT(1) | BIT(2),
    };
    @@ -1588,6 +1604,14 @@ static const struct usb_device_id option_ids[] = {
    .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
    { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
    .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
    + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_L),
    + .driver_info = (kernel_ulong_t)&zte_me3620_xl_blacklist },
    + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_MBIM),
    + .driver_info = (kernel_ulong_t)&zte_me3620_mbim_blacklist },
    + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_X),
    + .driver_info = (kernel_ulong_t)&zte_me3620_xl_blacklist },
    + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ZM8620_X),
    + .driver_info = (kernel_ulong_t)&zte_zm8620_x_blacklist },
    { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },
    { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },
    { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-10-27 23:01    [W:5.680 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site