diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-26 19:56:25 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-26 19:56:25 -0500 |
| commit | 87cf5586fdc91ea3b27739372af430b35b9c99db (patch) | |
| tree | b83f696e996aff2c1203fd59cbe43b522c0623f2 /include/linux/platform_data | |
| parent | bfccd95e7aba73d0d3154912b17b855cb9938c50 (diff) | |
| parent | 5072cfc40a80cea3749fd3413b3896630d8c787e (diff) | |
Merge tag 'usb-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v4.5
A ton of improvements to dwc2 have been made. The
driver should be a lot more stable on v4.5 then ever
before.
Our good old dwc3 got a few cleanups and misc fixes
and also added support to Xilinx's integration of
this IP.
Yoshihiro Shimoda gives us support for a new USB3
peripheral controller from Renesas.
Other than these, the usual misc fixes all over the
place.
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/usb-rcar-phy.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/linux/platform_data/usb-rcar-phy.h b/include/linux/platform_data/usb-rcar-phy.h deleted file mode 100644 index 8ec6964a32a5..000000000000 --- a/include/linux/platform_data/usb-rcar-phy.h +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2013 Renesas Solutions Corp. | ||
| 3 | * Copyright (C) 2013 Cogent Embedded, Inc. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __USB_RCAR_PHY_H | ||
| 11 | #define __USB_RCAR_PHY_H | ||
| 12 | |||
| 13 | #include <linux/types.h> | ||
| 14 | |||
| 15 | struct rcar_phy_platform_data { | ||
| 16 | bool ferrite_bead:1; /* (R8A7778 only) */ | ||
| 17 | |||
| 18 | bool port1_func:1; /* true: port 1 used by function, false: host */ | ||
| 19 | unsigned penc1:1; /* Output of the PENC1 pin in function mode */ | ||
| 20 | struct { /* Overcurrent pin control for ports 0..2 */ | ||
| 21 | bool select_3_3v:1; /* true: USB_OVCn pin, false: OVCn pin */ | ||
| 22 | /* Set to false on port 1 in function mode */ | ||
| 23 | bool active_high:1; /* true: active high, false: active low */ | ||
| 24 | /* Set to true on port 1 in function mode */ | ||
| 25 | } ovc_pin[3]; /* (R8A7778 only has 2 ports) */ | ||
| 26 | }; | ||
| 27 | |||
| 28 | #endif /* __USB_RCAR_PHY_H */ | ||
