Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.14.78 for ODROID-C2 #232

Merged
merged 37 commits into from
Sep 10, 2016
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a5ec4bf
x86/mm: Disable preemption during CR3 read+write
Aug 5, 2016
7b01567
arm64: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
Jul 25, 2016
b021a05
parisc: Fix order of EREFUSED define in errno.h
hdeller Aug 20, 2016
e64ccb6
PCI: Support PCIe devices with short cfg_size
Sep 30, 2015
9710cb2
PCI: Add Netronome vendor and device IDs
Sep 30, 2015
5fc03a5
PCI: Limit config space size for Netronome NFP6000 family
Sep 30, 2015
372fd0e
PCI: Add Netronome NFP4000 PF device ID
shorman-netronome Dec 11, 2015
16807e3
PCI: Limit config space size for Netronome NFP4000
shorman-netronome Dec 11, 2015
baa329f
usb: dwc3: gadget: increment request->actual once
Jul 29, 2016
59afff1
usb: define USB_SPEED_SUPER_PLUS speed for SuperSpeedPlus USB3.1 devices
matnyman Dec 10, 2015
4d54472
USB: validate wMaxPacketValue entries in endpoint descriptors
AlanStern Aug 1, 2016
0ede8e4
usb: xhci: Fix panic if disconnect
Aug 16, 2016
c7afd82
USB: serial: fix memleak in driver-registration error path
trashsee Aug 8, 2016
ac5ada1
USB: serial: option: add D-Link DWM-156/A3
lkundrak Jul 24, 2016
2df861b
USB: serial: option: add support for Telit LE920A4
dnlplm Aug 2, 2016
8e2f91d
USB: serial: ftdi_sio: add device ID for WICED USB UART dev board
shenghui-chu Jul 28, 2016
59317a7
USB: serial: ftdi_sio: add PIDs for Ivium Technologies devices
rdelien Jul 28, 2016
f857dfa
xhci: Make sure xhci handles USB_SPEED_SUPER_PLUS devices.
matnyman Jan 25, 2016
ea4e60b
EDAC: Increment correct counter in edac_inc_ue_error()
Apr 23, 2016
f5a67fa
s390/dasd: fix hanging device after clear subchannel
stefan-haberland Aug 8, 2016
950af82
mac80211: fix purging multicast PS buffer queue
nbd168 Aug 2, 2016
67d4aa4
aacraid: Check size values after double-fetch from user
Aug 5, 2016
8713d9c
cdc-acm: fix wrong pipe type on rx interrupt xfers
Aug 12, 2016
216f918
megaraid_sas: Fix probing cards without io port
Aug 6, 2016
b28302f
gpio: Fix OF build problem on UM
linusw Aug 16, 2016
ccb0813
fs/seq_file: fix out-of-bounds read
vegard Aug 25, 2016
fb21f63
Input: tegra-kbc - fix inverted reset logic
masahir0y Aug 22, 2016
930100a
Input: i8042 - break load dependency between atkbd/psmouse and i8042
dtor Jul 25, 2016
ab9668b
Input: i8042 - set up shared ps2_cmd_mutex for AUX ports
dtor Aug 17, 2016
d8a447a
crypto: nx - off by one bug in nx_of_update_msc()
Jul 15, 2016
b10f4ba
USB: fix typo in wMaxPacketSize validation
AlanStern Aug 22, 2016
fe7c1f5
USB: serial: mos7720: fix non-atomic allocation in write path
khoroshilov Aug 11, 2016
a241784
USB: serial: mos7840: fix non-atomic allocation in write path
khoroshilov Aug 11, 2016
425e96a
staging: comedi: daqboard2000: bug fix board type matching code
ian-abbott Jun 29, 2016
c6c9420
ACPI / sysfs: fix error code in get_status()
May 5, 2016
a38ae26
Linux 3.14.78
gregkh Sep 7, 2016
e9f83b0
Merge tag 'v3.14.78'
kmihelich Sep 10, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
USB: serial: option: add support for Telit LE920A4
commit 01d7956 upstream.

This patch adds a set of compositions for Telit LE920A4.

Compositions in short are:

0x1207: tty + tty
0x1208: tty + adb + tty + tty
0x1211: tty + adb + ecm
0x1212: tty + adb
0x1213: ecm + tty
0x1214: tty + adb + ecm + tty

telit_le922_blacklist_usbcfg3 is reused for compositions 0x1211
and 0x1214 due to the same interfaces positions.

Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
dnlplm authored and gregkh committed Sep 7, 2016
commit 2df861b79649b57f589d8b22473c1c5c115617c3
21 changes: 21 additions & 0 deletions drivers/usb/serial/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,12 @@ static void option_instat_callback(struct urb *urb);
#define TELIT_PRODUCT_LE920 0x1200
#define TELIT_PRODUCT_LE910 0x1201
#define TELIT_PRODUCT_LE910_USBCFG4 0x1206
#define TELIT_PRODUCT_LE920A4_1207 0x1207
#define TELIT_PRODUCT_LE920A4_1208 0x1208
#define TELIT_PRODUCT_LE920A4_1211 0x1211
#define TELIT_PRODUCT_LE920A4_1212 0x1212
#define TELIT_PRODUCT_LE920A4_1213 0x1213
#define TELIT_PRODUCT_LE920A4_1214 0x1214

/* ZTE PRODUCTS */
#define ZTE_VENDOR_ID 0x19d2
Expand Down Expand Up @@ -636,6 +642,11 @@ static const struct option_blacklist_info telit_le920_blacklist = {
.reserved = BIT(1) | BIT(5),
};

static const struct option_blacklist_info telit_le920a4_blacklist_1 = {
.sendsetup = BIT(0),
.reserved = BIT(1),
};

static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = {
.sendsetup = BIT(2),
.reserved = BIT(0) | BIT(1) | BIT(3),
Expand Down Expand Up @@ -1211,6 +1222,16 @@ static const struct usb_device_id option_ids[] = {
.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),
.driver_info = (kernel_ulong_t)&telit_le920_blacklist },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1207) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1208),
.driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1211),
.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1212),
.driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 },
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),
.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
.driver_info = (kernel_ulong_t)&net_intf1_blacklist },
Expand Down