Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+10
-4
drivers/usb/phy/Kconfig
+10
-4
drivers/usb/phy/Kconfig
···
4
4
menuconfig USB_PHY
5
5
bool "USB Physical Layer drivers"
6
6
help
7
-
USB controllers (those which are host, device or DRD) need a
8
-
device to handle the physical layer signalling, commonly called
9
-
a PHY.
7
+
Most USB controllers have the physical layer signalling part
8
+
(commonly called a PHY) built in. However, dual-role devices
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
19
if USB_PHY
14
20
+2
-1
drivers/usb/serial/ti_usb_3410_5052.c
+2
-1
drivers/usb/serial/ti_usb_3410_5052.c
···
172
172
{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
173
173
{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
174
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
177
{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
177
178
};
178
179
+3
-1
drivers/usb/serial/ti_usb_3410_5052.h
+3
-1
drivers/usb/serial/ti_usb_3410_5052.h
···
52
52
53
53
/* Abbott Diabetics vendor and product ids */
54
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
59
/* Commands */
58
60
#define TI_GET_VERSION 0x01