Commit b71055be authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg Kroah-Hartman:
 "Here are two USB patches for 3.10.

  One updates the Kconfig wording for CONFIG_USB_PHY to make it,
  hopefully, more obvious what this option is (I know you complained
  about this when it hit the tree.) The other is a new device id for a
  driver"

* tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable
  usb: phy: Improve Kconfig help for CONFIG_USB_PHY
parents dcfdc28f 35a2fbc9
...@@ -4,11 +4,17 @@ ...@@ -4,11 +4,17 @@
menuconfig USB_PHY menuconfig USB_PHY
bool "USB Physical Layer drivers" bool "USB Physical Layer drivers"
help help
USB controllers (those which are host, device or DRD) need a Most USB controllers have the physical layer signalling part
device to handle the physical layer signalling, commonly called (commonly called a PHY) built in. However, dual-role devices
a PHY. (a.k.a. USB on-the-go) which support being USB master or slave
with the same connector often use an external PHY.
The following drivers add support for such PHY devices. The drivers in this submenu add support for such PHY devices.
They are not needed for standard master-only (or the vast
majority of slave-only) USB interfaces.
If you're not sure if this applies to you, it probably doesn't;
say N here.
if USB_PHY if USB_PHY
......
...@@ -172,7 +172,8 @@ static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = { ...@@ -172,7 +172,8 @@ static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = {
{ 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_454B_PRODUCT_ID) },
{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) }, { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) },
{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
}; };
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
/* Abbott Diabetics vendor and product ids */ /* Abbott Diabetics vendor and product ids */
#define ABBOTT_VENDOR_ID 0x1a61 #define ABBOTT_VENDOR_ID 0x1a61
#define ABBOTT_PRODUCT_ID 0x3410 #define ABBOTT_STEREO_PLUG_ID 0x3410
#define ABBOTT_PRODUCT_ID ABBOTT_STEREO_PLUG_ID
#define ABBOTT_STRIP_PORT_ID 0x3420
/* Commands */ /* Commands */
#define TI_GET_VERSION 0x01 #define TI_GET_VERSION 0x01
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment