diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 20:36:14 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 20:36:14 -0400 |
| commit | 5b146f7e016a8727a98b3d48e4f4e128d3624cd5 (patch) | |
| tree | 308acba9e7fdb00ab1458ebacd25dd049e310996 /drivers/usb/chipidea/bits.h | |
| parent | 626f090c5cbbe557379978c7a9525011ad7fbbf6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
Merge 3.11-rc4 into usb-next
We want those fixes in here also.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 |