Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97dcf041 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: two more usb ids for ti_usb_3410_5052 



This patch adds device IDs and balances the counts to make the
hot ID additioning mechanism work.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Cc: stable <stable@kernel.org>
Cc: Chris Adams <cmadams@hiwaay.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64905b48

drivers/usb/serial/ti_usb_3410_5052.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static unsigned int product_5052_count; 
/* the array dimension is the number of default entries plus */

/* the array dimension is the number of default entries plus */

/* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */

/* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */

/* null entry */

/* null entry */

static struct usb_device_id ti_id_table_3410[7+TI_EXTRA_VID_PID_COUNT+1] = {

static struct usb_device_id ti_id_table_3410[10+TI_EXTRA_VID_PID_COUNT+1] = {

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -185,9 +185,11 @@ static struct usb_device_id ti_id_table_3410[7+TI_EXTRA_VID_PID_COUNT+1] = { 
	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_PRODUCT_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_PRODUCT_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_EDGE_PRODUCT_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_EDGE_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },

};

};





static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = {

static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
@@ -195,7 +197,7 @@ static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { 
	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },

};

};





static struct usb_device_id ti_id_table_combined[6+2*TI_EXTRA_VID_PID_COUNT+1] = {

static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = {

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -208,6 +210,8 @@ static struct usb_device_id ti_id_table_combined[6+2*TI_EXTRA_VID_PID_COUNT+1] = 
	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },

	{ }

	{ }

};

};

drivers/usb/serial/ti_usb_3410_5052.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ 
#define IBM_VENDOR_ID			0x04b3

#define IBM_VENDOR_ID			0x04b3

#define TI_3410_PRODUCT_ID		0x3410

#define TI_3410_PRODUCT_ID		0x3410

#define IBM_4543_PRODUCT_ID		0x4543

#define IBM_4543_PRODUCT_ID		0x4543

#define IBM_454B_PRODUCT_ID		0x454b

#define IBM_454C_PRODUCT_ID		0x454c

#define TI_3410_EZ430_ID		0xF430  /* TI ez430 development tool */

#define TI_3410_EZ430_ID		0xF430  /* TI ez430 development tool */

#define TI_5052_BOOT_PRODUCT_ID		0x5052	/* no EEPROM, no firmware */

#define TI_5052_BOOT_PRODUCT_ID		0x5052	/* no EEPROM, no firmware */

#define TI_5152_BOOT_PRODUCT_ID		0x5152	/* no EEPROM, no firmware */

#define TI_5152_BOOT_PRODUCT_ID		0x5152	/* no EEPROM, no firmware */