Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'usb-4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are two small fixes, and one new device id, for 4.8-rc7
The fixes solve a build error that was reported in your tree for the
blackfin arch, and resolve an issue with a number of broken USB
devices that reported the wrong interval rate. Included here is also
a new device id for the usb-serial driver.
All have been in linux-next with no reported issues"
* tag 'usb-4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: change bInterval default to 10 ms
usb: musb: Fix tusb6010 compile error on blackfin
USB: serial: simple: add support for another Infineon flashloader
+20
-13
+17
-11
drivers/usb/core/config.c
+17
-11
drivers/usb/core/config.c
···
240
240
memcpy(&endpoint->desc, d, n);
241
241
INIT_LIST_HEAD(&endpoint->urb_list);
242
242
243
-
/* Fix up bInterval values outside the legal range. Use 32 ms if no
244
-
* proper value can be guessed. */
243
+
/*
244
+
* Fix up bInterval values outside the legal range.
245
+
* Use 10 or 8 ms if no proper value can be guessed.
246
+
*/
245
247
i = 0; /* i = min, j = max, n = default */
246
248
j = 255;
247
249
if (usb_endpoint_xfer_int(d)) {
···
252
250
case USB_SPEED_SUPER_PLUS:
253
251
case USB_SPEED_SUPER:
254
252
case USB_SPEED_HIGH:
255
-
/* Many device manufacturers are using full-speed
253
+
/*
254
+
* Many device manufacturers are using full-speed
256
255
* bInterval values in high-speed interrupt endpoint
257
-
* descriptors. Try to fix those and fall back to a
258
-
* 32 ms default value otherwise. */
256
+
* descriptors. Try to fix those and fall back to an
257
+
* 8-ms default value otherwise.
258
+
*/
259
259
n = fls(d->bInterval*8);
260
260
if (n == 0)
261
-
n = 9; /* 32 ms = 2^(9-1) uframes */
261
+
n = 7; /* 8 ms = 2^(7-1) uframes */
262
262
j = 16;
263
263
264
264
/*
···
275
271
}
276
272
break;
277
273
default: /* USB_SPEED_FULL or _LOW */
278
-
/* For low-speed, 10 ms is the official minimum.
274
+
/*
275
+
* For low-speed, 10 ms is the official minimum.
279
276
* But some "overclocked" devices might want faster
280
-
* polling so we'll allow it. */
281
-
n = 32;
277
+
* polling so we'll allow it.
278
+
*/
279
+
n = 10;
282
280
break;
283
281
}
284
282
} else if (usb_endpoint_xfer_isoc(d)) {
···
288
282
j = 16;
289
283
switch (to_usb_device(ddev)->speed) {
290
284
case USB_SPEED_HIGH:
291
-
n = 9; /* 32 ms = 2^(9-1) uframes */
285
+
n = 7; /* 8 ms = 2^(7-1) uframes */
292
286
break;
293
287
default: /* USB_SPEED_FULL */
294
-
n = 6; /* 32 ms = 2^(6-1) frames */
288
+
n = 4; /* 8 ms = 2^(4-1) frames */
295
289
break;
296
290
}
297
291
}
+1
-1
drivers/usb/musb/Kconfig
+1
-1
drivers/usb/musb/Kconfig
···
87
87
config USB_MUSB_TUSB6010
88
88
tristate "TUSB6010"
89
89
depends on HAS_IOMEM
90
-
depends on ARCH_OMAP2PLUS || COMPILE_TEST
90
+
depends on (ARCH_OMAP2PLUS || COMPILE_TEST) && !BLACKFIN
91
91
depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules
92
92
93
93
config USB_MUSB_OMAP2PLUS
+2
-1
drivers/usb/serial/usb-serial-simple.c
+2
-1
drivers/usb/serial/usb-serial-simple.c
···
54
54
/* Infineon Flashloader driver */
55
55
#define FLASHLOADER_IDS() \
56
56
{ USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
57
-
{ USB_DEVICE(0x8087, 0x0716) }
57
+
{ USB_DEVICE(0x8087, 0x0716) }, \
58
+
{ USB_DEVICE(0x8087, 0x0801) }
58
59
DEVICE(flashloader, FLASHLOADER_IDS);
59
60
60
61
/* Google Serial USB SubClass */