diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2017-04-13 09:57:32 -0500 |
|---|---|---|
| committer | Jeff Hatch <jhatch@multitech.com> | 2017-04-13 09:57:32 -0500 |
| commit | 00aeca342ec0361ee7f6dd1cbc2d28fa4cb93290 (patch) | |
| tree | 7eb0c06b2d4ac519e7761c68238744f54e620782 /recipes-kernel | |
| parent | 50fb898d80f1e244cb369589c850f04f414eee6d (diff) | |
| parent | 96f5e2f331c7548d08b104cc4931618084730cb9 (diff) | |
| download | meta-multitech-00aeca342ec0361ee7f6dd1cbc2d28fa4cb93290.tar.gz meta-multitech-00aeca342ec0361ee7f6dd1cbc2d28fa4cb93290.tar.bz2 meta-multitech-00aeca342ec0361ee7f6dd1cbc2d28fa4cb93290.zip | |
Merge branch 'usb-serial-simple2'
Diffstat (limited to 'recipes-kernel')
3 files changed, 32 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig b/recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig index 5639eb4..bfa0e38 100644 --- a/recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig +++ b/recipes-kernel/linux/linux-3.12.27/mtcdt/defconfig @@ -2004,7 +2004,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_SIMPLE is not set +CONFIG_USB_SERIAL_SIMPLE=m CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m diff --git a/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-usb-serial-simple-telit.patch b/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-usb-serial-simple-telit.patch new file mode 100644 index 0000000..b00ca28 --- /dev/null +++ b/recipes-kernel/linux/linux-3.12.27/mtcdt/linux-3.12-usb-serial-simple-telit.patch @@ -0,0 +1,30 @@ +diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c +index 3be47c2..4608e7f 100644 +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1727,6 +1727,11 @@ static const struct usb_device_id acm_ids[] = { + {USB_DEVICE(0x04e2, 0x1414), + .driver_info = IGNORE_DEVICE, + }, ++ /* Telit flashing ++ */ ++ {USB_DEVICE(0x058b, 0x0041), ++ .driver_info = IGNORE_DEVICE, ++ }, + + /* control interfaces without any protocol set */ + { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, +diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c +index 147f019..2008329 100644 +--- a/drivers/usb/serial/usb-serial-simple.c ++++ b/drivers/usb/serial/usb-serial-simple.c +@@ -48,6 +48,7 @@ DEVICE(funsoft, FUNSOFT_IDS); + + /* Infineon Flashloader driver */ + #define FLASHLOADER_IDS() \ ++ { USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \ + { USB_DEVICE(0x8087, 0x0716) } + DEVICE(flashloader, FLASHLOADER_IDS); + +-- +2.8.2
\ No newline at end of file diff --git a/recipes-kernel/linux/linux_3.12.27.bb b/recipes-kernel/linux/linux_3.12.27.bb index e266d41..5f1851d 100644 --- a/recipes-kernel/linux/linux_3.12.27.bb +++ b/recipes-kernel/linux/linux_3.12.27.bb @@ -37,6 +37,7 @@ SRC_URI_append_mtcdt = "\ file://linux-3.12-eeprom-setup-mtcdt.patch \ file://linux-3.12-mtcdt-device-tree.patch \ file://linux-3.12-add-num_accessory_ports-config-option.patch \ + file://linux-3.12-usb-serial-simple-telit.patch \ " SRC_URI_append_mtcap = "\ |