diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-13 14:01:13 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-13 14:01:13 -0700 |
commit | 90221170bfe101de59a05910b4cb6d6e5de046b1 (patch) | |
tree | ff3aa3ac0a8cb3ce8190511874a03ab2b13fc8ff /include | |
parent | Merge 3.3-rc7 into usb-next (diff) | |
parent | usb: host: xhci: add platform driver support (diff) | |
download | linux-dev-90221170bfe101de59a05910b4cb6d6e5de046b1.tar.xz linux-dev-90221170bfe101de59a05910b4cb6d6e5de046b1.zip |
Merge tag 'for-usb-next-2012-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
Hi Greg,
Here's my final pull request for 3.4. All the patches have been under
review for some time (months in some cases). The ring expansion patches
in particular have been tested by both me and Paul Zimmerman from
Synopsis.
They add support for:
- Dynamic ring expansion
- New USB 2.1 link PM errata (BESL)
- xHCI host controller support for the Synopsis DesignWare 3 IP
The dynamic ring expansion patches finally make test 10 of the host-side
test pass, instead of failing due to no room on the endpoint ring for
the larger transfers. I would have hoped that the ring expansion
patchset would make the Point Grey USB 3.0 camera work, but sadly it
fails to respond to a control transfer on my test system. This doesn't
seem to be a driver bug, but it could be a device or host bug.
Felipe has tested the patches to add a platform device to the xHCI
driver on the Synopsis DesignWare 3 IP in the TI OMAP5 board.
Please pull.
Thanks,
Sarah Sharp
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb/ch9.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index 3b6f628880f8..af21f3115919 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -789,6 +789,11 @@ struct usb_ext_cap_descriptor { /* Link Power Management */ __u8 bDevCapabilityType; __le32 bmAttributes; #define USB_LPM_SUPPORT (1 << 1) /* supports LPM */ +#define USB_BESL_SUPPORT (1 << 2) /* supports BESL */ +#define USB_BESL_BASELINE_VALID (1 << 3) /* Baseline BESL valid*/ +#define USB_BESL_DEEP_VALID (1 << 4) /* Deep BESL valid */ +#define USB_GET_BESL_BASELINE(p) (((p) & (0xf << 8)) >> 8) +#define USB_GET_BESL_DEEP(p) (((p) & (0xf << 12)) >> 12) } __attribute__((packed)); #define USB_DT_USB_EXT_CAP_SIZE 7 |