mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-25 21:37:45 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
From 3a586ee50e3f8a380125a8ce332de9f4c0ef727e Mon Sep 17 00:00:00 2001
|
|
From: Dan Williams <dcbw@redhat.com>
|
|
Date: Mon, 7 May 2012 04:24:51 +0000
|
|
Subject: [PATCH 45/56] cdc_ether: add Novatel USB551L device IDs for
|
|
FLAG_WWAN
|
|
|
|
commit 4e6304b8420aba5311ba21fd68dab2924ae4d91a upstream.
|
|
|
|
Needs to be tagged with FLAG_WWAN, which since it has generic
|
|
descriptors, won't happen if we don't override the generic
|
|
driver info.
|
|
|
|
Cc: Oliver Neukum <oliver@neukum.org>
|
|
Signed-off-by: Dan Williams <dcbw@redhat.com>
|
|
Acked-by: Oliver Neukum <oliver@neukum.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/net/usb/cdc_ether.c | 16 ++++++++++++++++
|
|
1 files changed, 16 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
|
|
index eac4886..2ba40cf 100644
|
|
--- a/drivers/net/usb/cdc_ether.c
|
|
+++ b/drivers/net/usb/cdc_ether.c
|
|
@@ -482,6 +482,7 @@ static const struct driver_info wwan_info = {
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
#define HUAWEI_VENDOR_ID 0x12D1
|
|
+#define NOVATEL_VENDOR_ID 0x1410
|
|
|
|
static const struct usb_device_id products [] = {
|
|
/*
|
|
@@ -599,6 +600,21 @@ static const struct usb_device_id products [] = {
|
|
* because of bugs/quirks in a given product (like Zaurus, above).
|
|
*/
|
|
{
|
|
+ /* Novatel USB551L */
|
|
+ /* This match must come *before* the generic CDC-ETHER match so that
|
|
+ * we get FLAG_WWAN set on the device, since it's descriptors are
|
|
+ * generic CDC-ETHER.
|
|
+ */
|
|
+ .match_flags = USB_DEVICE_ID_MATCH_VENDOR
|
|
+ | USB_DEVICE_ID_MATCH_PRODUCT
|
|
+ | USB_DEVICE_ID_MATCH_INT_INFO,
|
|
+ .idVendor = NOVATEL_VENDOR_ID,
|
|
+ .idProduct = 0xB001,
|
|
+ .bInterfaceClass = USB_CLASS_COMM,
|
|
+ .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET,
|
|
+ .bInterfaceProtocol = USB_CDC_PROTO_NONE,
|
|
+ .driver_info = (unsigned long)&wwan_info,
|
|
+}, {
|
|
USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,
|
|
USB_CDC_PROTO_NONE),
|
|
.driver_info = (unsigned long) &cdc_info,
|
|
--
|
|
1.7.7.6
|
|
|