diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 19:48:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 19:48:27 -0500 |
| commit | f90d64483ebd394958841f67f8794ab203b319a7 (patch) | |
| tree | 3da8638603681adfe9bea7897c03ea27b40ef4f4 /include/linux/device.h | |
| parent | 67e79a6dc2664a3ef85113440e60f7aaca3c7815 (diff) | |
| parent | 1c7cf3d5e1c181caca75012b65252288c18a25f2 (diff) | |
Merge tag 'usb-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY updates from Greg KH:
"Here is the big USB/PHY driver pull request for 5.1-rc1.
The usual set of gadget driver updates, phy driver updates, xhci
updates, and typec additions. Also included in here are a lot of small
cleanups and fixes and driver updates where needed.
All of these have been in linux-next for a while with no reported
issues"
* tag 'usb-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (167 commits)
wusb: Remove unnecessary static function ckhdid_printf
usb: core: make default autosuspend delay configurable
usb: core: Fix typo in description of "authorized_default"
usb: chipidea: Refactor USB PHY selection and keep a single PHY
usb: chipidea: Grab the (legacy) USB PHY by phandle first
usb: chipidea: imx: set power polarity
dt-bindings: usb: ci-hdrc-usb2: add property power-active-high
usb: chipidea: imx: remove unused header files
usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
usb: core: add option of only authorizing internal devices
usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
usb: xhci: Fix for Enabling USB ROLE SWITCH QUIRK on INTEL_SUNRISEPOINT_LP_XHCI
usb: xhci: fix build warning - missing prototype
usb: xhci: dbc: Fixing typo error.
usb: xhci: remove unused member 'parent' in xhci_regset struct
xhci: tegra: Prevent error pointer dereference
USB: serial: option: add Telit ME910 ECM composition
usb: core: Replace hardcoded check with inline function from usb.h
usb: core: skip interfaces disabled in devicetree
usb: typec: mux: remove redundant check on variable match
...
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 928e899ccbfb..54b586105179 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -758,11 +758,17 @@ struct device_dma_parameters { | |||
| 758 | 758 | ||
| 759 | /** | 759 | /** |
| 760 | * struct device_connection - Device Connection Descriptor | 760 | * struct device_connection - Device Connection Descriptor |
| 761 | * @fwnode: The device node of the connected device | ||
| 761 | * @endpoint: The names of the two devices connected together | 762 | * @endpoint: The names of the two devices connected together |
| 762 | * @id: Unique identifier for the connection | 763 | * @id: Unique identifier for the connection |
| 763 | * @list: List head, private, for internal use only | 764 | * @list: List head, private, for internal use only |
| 765 | * | ||
| 766 | * NOTE: @fwnode is not used together with @endpoint. @fwnode is used when | ||
| 767 | * platform firmware defines the connection. When the connection is registered | ||
| 768 | * with device_connection_add() @endpoint is used instead. | ||
| 764 | */ | 769 | */ |
| 765 | struct device_connection { | 770 | struct device_connection { |
| 771 | struct fwnode_handle *fwnode; | ||
| 766 | const char *endpoint[2]; | 772 | const char *endpoint[2]; |
| 767 | const char *id; | 773 | const char *id; |
| 768 | struct list_head list; | 774 | struct list_head list; |
