usb: Update PID to 9048 for mdm_bridge, diag_bridge, embedded rmnet drivers
mdm9x15 default composition changed from 0x9001 to 0x9048 to include
new serial interfaces and additional rmnet interfaces. Hence update the
PID for mdm_bridge, diag_bridge, embedded rmnet drivers to support new
composition.
Change-Id: I5c3778ef6b8fddd07d1a0789213e4b289ccc7567
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
diff --git a/arch/arm/mach-msm/include/mach/usb_bridge.h b/arch/arm/mach-msm/include/mach/usb_bridge.h
index 2b7e754..effa395 100644
--- a/arch/arm/mach-msm/include/mach/usb_bridge.h
+++ b/arch/arm/mach-msm/include/mach/usb_bridge.h
@@ -22,10 +22,6 @@
*/
#define MAX_BRIDGE_DEVICES 2
-/*PID 9001*/
-#define DUN_IFACE_NUM 2
-#define TETHERED_RMNET_IFACE_NUM 3
-
struct bridge_ops {
int (*send_pkt)(void *, void *, size_t actual);
void (*send_cbits)(void *, unsigned int);
diff --git a/drivers/net/usb/rmnet_usb_data.c b/drivers/net/usb/rmnet_usb_data.c
index 6df586d..fa0cd82 100644
--- a/drivers/net/usb/rmnet_usb_data.c
+++ b/drivers/net/usb/rmnet_usb_data.c
@@ -22,7 +22,7 @@
#define RMNET_DATA_LEN 2000
#define HEADROOM_FOR_QOS 8
-#define FIRST_RMNET_USB_INTERFACE 4
+#define FIRST_RMNET_USB_INTERFACE 5
#define NUM_EMBEDDED_RMNET_IFACE 4
static int data_msg_dbg_mask;
@@ -514,7 +514,7 @@
static const struct usb_device_id vidpids[] = {
{
- USB_DEVICE(0x05c6, 0x9034), /* MDM9x15*/
+ USB_DEVICE(0x05c6, 0x9048), /* MDM9x15*/
.driver_info = (unsigned long)&rmnet_info,
},
{ },
diff --git a/drivers/usb/misc/diag_bridge.c b/drivers/usb/misc/diag_bridge.c
index 9b60f70..017ee8a 100644
--- a/drivers/usb/misc/diag_bridge.c
+++ b/drivers/usb/misc/diag_bridge.c
@@ -293,7 +293,7 @@
#define VALID_INTERFACE_NUM 0
static const struct usb_device_id diag_bridge_ids[] = {
- { USB_DEVICE(0x5c6, 0x9001),
+ { USB_DEVICE(0x5c6, 0x9048),
.driver_info = VALID_INTERFACE_NUM, },
{} /* terminating entry */
diff --git a/drivers/usb/misc/mdm_data_bridge.c b/drivers/usb/misc/mdm_data_bridge.c
index 632a8c7..89b8e5a 100644
--- a/drivers/usb/misc/mdm_data_bridge.c
+++ b/drivers/usb/misc/mdm_data_bridge.c
@@ -753,6 +753,9 @@
static void data_bridge_debugfs_exit(void) { }
#endif
+#define DUN_IFACE_NUM 3
+#define TETHERED_RMNET_IFACE_NUM 4
+
static int __devinit
bridge_probe(struct usb_interface *iface, const struct usb_device_id *id)
{
@@ -871,7 +874,7 @@
}
static const struct usb_device_id bridge_ids[] = {
- { USB_DEVICE(0x5c6, 0x9001) },
+ { USB_DEVICE(0x5c6, 0x9048) },
{ } /* Terminating entry */
};