Commit 975dc33b authored by Darren Hart's avatar Darren Hart Committed by Greg Kroah-Hartman
Browse files

USB: serial: ti_usb_3410_5052: Add support for the FRI2 serial console 

The Kontron M2M development board, also known as the Fish River Island II,
has an optional daughter card providing access to the PCH_UART (EG20T) via
a ti_usb_3410_5052 uart to usb chip.

http://us.kontron.com/products/systems+and+platforms/m2m/m2m+smart+services+developer+kit.html



Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
CC: Al Borchers <alborchers@steinerpoint.com>
CC: Peter Berger <pberger@brimson.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d530296f

drivers/usb/serial/ti_usb_3410_5052.c

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

/* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */

/* null entry */

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

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

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -180,6 +180,7 @@ static struct usb_device_id ti_id_table_3410[14+TI_EXTRA_VID_PID_COUNT+1] = { 
	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },

	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },

};



static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
@@ -189,7 +190,7 @@ static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = { 
	{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },

};



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

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

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },

	{ USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -208,6 +209,7 @@ static struct usb_device_id ti_id_table_combined[18+2*TI_EXTRA_VID_PID_COUNT+1] 
	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },

	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },

	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },

	{ }

};

drivers/usb/serial/ti_usb_3410_5052.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define TI_5152_BOOT_PRODUCT_ID		0x5152	/* no EEPROM, no firmware */

#define TI_5052_EEPROM_PRODUCT_ID	0x505A	/* EEPROM, no firmware */

#define TI_5052_FIRMWARE_PRODUCT_ID	0x505F	/* firmware is running */

#define FRI2_PRODUCT_ID			0x5053  /* Fish River Island II */



/* Multi-Tech vendor and product ids */

#define MTS_VENDOR_ID			0x06E0

CRA Git | Maintained and supported by SUSTech CRA and CCSE