diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 14:31:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-31 14:31:36 -0400 |
| commit | 3132be9aefc6c7edd42156a35cc2a2134d154f5d (patch) | |
| tree | 99dddada0e24e84d62855adf0a624c5ba4e35a01 /drivers/usb/chipidea/bits.h | |
| parent | a93f66dc5ff51a8f88f13e4a4b8e3e51ed89c0a5 (diff) | |
| parent | fed1f1ed90bce42ea010e2904cbc04e7b8304940 (diff) | |
Merge tag 'usb-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some tiny USB fixes for 3.11-rc4
Nothing major, some gadget fixes, some new device ids, a new tiny
driver for the ANT+ USB device, and a number of fixes for the mos7840
driver that were much needed"
* tag 'usb-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: serial: ftdi_sio: add more RT Systems ftdi devices
usb: chipidea: fix the build error with randconfig
usb: chipidea: cast PORTSC_PTS and DEVLC_PTS macros
usb: gadget: udc-core: fix the typo of udc state attribute
usb: gadget: f_phonet: remove unused preprocessor conditional
usb: gadget: multi: fix error return code in cdc_do_config()
USB: mos7840: fix pointer casts
USB: mos7840: fix race in led handling
USB: mos7840: fix device-type detection
USB: mos7840: fix race in register handling
USB: serial: add driver for Suunto ANT+ USB device
usb: gadget: free opts struct on error recovery
usb: gadget: ether: put_usb_function on unbind
usb: musb: fix resource passed from glue layer to musb
Diffstat (limited to 'drivers/usb/chipidea/bits.h')
| -rw-r--r-- | drivers/usb/chipidea/bits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h index aefa0261220c..1b23e354f9fb 100644 --- a/drivers/usb/chipidea/bits.h +++ b/drivers/usb/chipidea/bits.h | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | #define PORTSC_PTC (0x0FUL << 16) | 50 | #define PORTSC_PTC (0x0FUL << 16) |
| 51 | /* PTS and PTW for non lpm version only */ | 51 | /* PTS and PTW for non lpm version only */ |
| 52 | #define PORTSC_PTS(d) \ | 52 | #define PORTSC_PTS(d) \ |
| 53 | ((((d) & 0x3) << 30) | (((d) & 0x4) ? BIT(25) : 0)) | 53 | (u32)((((d) & 0x3) << 30) | (((d) & 0x4) ? BIT(25) : 0)) |
| 54 | #define PORTSC_PTW BIT(28) | 54 | #define PORTSC_PTW BIT(28) |
| 55 | #define PORTSC_STS BIT(29) | 55 | #define PORTSC_STS BIT(29) |
| 56 | 56 | ||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define DEVLC_PSPD_HS (0x02UL << 25) | 59 | #define DEVLC_PSPD_HS (0x02UL << 25) |
| 60 | #define DEVLC_PTW BIT(27) | 60 | #define DEVLC_PTW BIT(27) |
| 61 | #define DEVLC_STS BIT(28) | 61 | #define DEVLC_STS BIT(28) |
| 62 | #define DEVLC_PTS(d) (((d) & 0x7) << 29) | 62 | #define DEVLC_PTS(d) (u32)(((d) & 0x7) << 29) |
| 63 | 63 | ||
| 64 | /* Encoding for DEVLC_PTS and PORTSC_PTS */ | 64 | /* Encoding for DEVLC_PTS and PORTSC_PTS */ |
| 65 | #define PTS_UTMI 0 | 65 | #define PTS_UTMI 0 |