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

Commit 26ab7053 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Greg Kroah-Hartman
Browse files

usb-serial: Use ftdi_sio driver for RATOC REX-USB60F 



This patch reverts 57833ea6
("usb-serial: pl2303: add support for RATOC REX-USB60F") and adds
support for the device to ftdi_sio driver.

Cc: Akira Tsukamoto <akirat@rd.scei.sony.co.jp>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c110a2bd

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ static struct usb_device_id id_table_combined [] = { 
		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },

	{ },					/* Optional parameter entry */

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio.h

+6 −0
Original line number Diff line number Diff line
@@ -591,6 +591,12 @@ 
#define	FIC_VID			0x1457

#define	FIC_NEO1973_DEBUG_PID	0x5118



/*

 * RATOC REX-USB60F

 */

#define RATOC_VENDOR_ID		0x0584

#define RATOC_PRODUCT_ID_USB60F	0xb020



/*

 *   BmRequestType:  1100 0000b

 *   bRequest:       FTDI_E2_READ

drivers/usb/serial/pl2303.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static struct usb_device_id id_table [] = { 
	{ USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) },

	{ USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) },

	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) },

	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },

	{ USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) },

	{ USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },

	{ USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },

drivers/usb/serial/pl2303.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


#define RATOC_VENDOR_ID		0x0584

#define RATOC_PRODUCT_ID	0xb000

#define RATOC_PRODUCT_ID_USB60F	0xb020



#define TRIPP_VENDOR_ID		0x2478

#define TRIPP_PRODUCT_ID	0x2008