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
Unified · Split
| @@ -4,11 +4,17 @@ · 3 unmodified lines | |||
| 4 | menuconfig USB_PHY | 4 | menuconfig USB_PHY |
| 5 | bool "USB Physical Layer drivers" | 5 | bool "USB Physical Layer drivers" |
| 6 | help | 6 | help |
| 7 | USB controllers (those which are host, device or DRD) need a | 7 | Most USB controllers have the physical layer signalling part |
| 8 | device to handle the physical layer signalling, commonly called | 8 | (commonly called a PHY) built in. However, dual-role devices |
| 9 | a PHY. | 9 | (a.k.a. USB on-the-go) which support being USB master or slave |
| 10 | with the same connector often use an external PHY. | ||
| 10 | 11 | ||
| 11 | The following drivers add support for such PHY devices. | 12 | The drivers in this submenu add support for such PHY devices. |
| 13 | They are not needed for standard master-only (or the vast | ||
| 14 | majority of slave-only) USB interfaces. | ||
| 15 | |||
| 16 | If you're not sure if this applies to you, it probably doesn't; | ||
| 17 | say N here. | ||
| 12 | 18 | ||
| 13 | if USB_PHY | 19 | if USB_PHY |
| 14 | 20 | ||
| @@ -172,7 +172,8 @@ static struct usb_device_id ti_id_table_3410[15+TI_EXTRA_VID_PID_COUNT+1] = { · 171 unmodified lines | |||
| 172 | { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, | 172 | { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, |
| 173 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, | 173 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, |
| 174 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, | 174 | { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, |
| 175 | { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) }, | 175 | { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) }, |
| 176 | { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) }, | ||
| 176 | { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, | 177 | { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, |
| 177 | }; | 178 | }; |
| 178 | 179 | ||
| @@ -52,7 +52,9 @@ · 51 unmodified lines | |||
| 52 | 52 | ||
| 53 | /* Abbott Diabetics vendor and product ids */ | 53 | /* Abbott Diabetics vendor and product ids */ |
| 54 | #define ABBOTT_VENDOR_ID 0x1a61 | 54 | #define ABBOTT_VENDOR_ID 0x1a61 |
| 55 | #define ABBOTT_PRODUCT_ID 0x3410 | 55 | #define ABBOTT_STEREO_PLUG_ID 0x3410 |
| 56 | #define ABBOTT_PRODUCT_ID ABBOTT_STEREO_PLUG_ID | ||
| 57 | #define ABBOTT_STRIP_PORT_ID 0x3420 | ||
| 56 | 58 | ||
| 57 | /* Commands */ | 59 | /* Commands */ |
| 58 | #define TI_GET_VERSION 0x01 | 60 | #define TI_GET_VERSION 0x01 |