Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-24 12:07:35 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-24 12:07:54 +0200
commitf1e8781cd9113244fc47e0ea78667ecbffed39c8 (patch)
tree22ef28d2780ccba3691c12f87ed8df7ae90fbc76
parentd3eb125456598413aa9aa984a35facf4d88b8d45 (diff)
USB: serial: option: add Telit 0x1260 and 0x1261 compositions
(bsc#1051510).
-rw-r--r--patches.drivers/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.drivers/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch b/patches.drivers/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch
new file mode 100644
index 0000000000..2c142f3da9
--- /dev/null
+++ b/patches.drivers/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch
@@ -0,0 +1,37 @@
+From f3dfd4072c3ee6e287f501a18b5718b185d6a940 Mon Sep 17 00:00:00 2001
+From: Daniele Palmas <dnlplm@gmail.com>
+Date: Wed, 15 May 2019 17:27:49 +0200
+Subject: [PATCH] USB: serial: option: add Telit 0x1260 and 0x1261 compositions
+Git-commit: f3dfd4072c3ee6e287f501a18b5718b185d6a940
+Patch-mainline: v5.2-rc5
+References: bsc#1051510
+
+Added support for Telit LE910Cx 0x1260 and 0x1261 compositions.
+
+Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/usb/serial/option.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 100a5c0ec3e7..a0aaf0635359 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -1171,6 +1171,10 @@ static const struct usb_device_id option_ids[] = {
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },
+ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),
+ .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
++ { USB_DEVICE(TELIT_VENDOR_ID, 0x1260),
++ .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
++ { USB_DEVICE(TELIT_VENDOR_ID, 0x1261),
++ .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
+ { USB_DEVICE(TELIT_VENDOR_ID, 0x1900), /* Telit LN940 (QMI) */
+ .driver_info = NCTRL(0) | RSVD(1) },
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 5f4f258f52..86ed7b2448 100644
--- a/series.conf
+++ b/series.conf
@@ -22603,6 +22603,7 @@
patches.drivers/usb-dwc2-Fix-DMA-cache-alignment-issues.patch
patches.drivers/USB-serial-option-add-support-for-Simcom-SIM7500-SIM.patch
patches.drivers/USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.patch
+ patches.drivers/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch
patches.drivers/platform-x86-mlx-platform-Fix-parent-device-in-i2c-m.patch
patches.drivers/ras-cec-fix-binary-search-function.patch
patches.drivers/ras-cec-convert-the-timer-callback-to-a-workqueue.patch