aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb/tcpm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-08 13:03:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-08 13:03:52 -0400
commit132d68d37d33f1d0b9c1f507c8b4d64c27ecec8a (patch)
treeb3c05972e5579e1574873fe745fb1358c62a269c /include/linux/usb/tcpm.h
parent80f232121b69cc69a31ccb2b38c1665d770b0710 (diff)
parent3515468a87a47781f6af818773650513ff14656a (diff)
Merge tag 'usb-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY updates from Greg KH: "Here is the big set of USB and PHY driver patches for 5.2-rc1 There is the usual set of: - USB gadget updates - PHY driver updates and additions - USB serial driver updates and fixes - typec updates and new chips supported - mtu3 driver updates - xhci driver updates - other tiny driver updates Nothing really interesting, just constant forward progress. All of these have been in linux-next for a while with no reported issues. The usb-gadget and usb-serial trees were merged a bit "late", but both of them had been in linux-next before they got merged here last Friday" * tag 'usb-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (206 commits) USB: serial: f81232: implement break control USB: serial: f81232: add high baud rate support USB: serial: f81232: clear overrun flag USB: serial: f81232: fix interrupt worker not stop usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA usb: dwc3: Fix default lpm_nyet_threshold value usb: dwc3: debug: Print GET_STATUS(device) tracepoint usb: dwc3: Do core validation early on probe usb: dwc3: gadget: Set lpm_capable usb: gadget: atmel: tie wake lock to running clock usb: gadget: atmel: support USB suspend usb: gadget: atmel_usba_udc: simplify setting of interrupt-enabled mask dwc2: gadget: Fix completed transfer size calculation in DDMA usb: dwc2: Set lpm mode parameters depend on HW configuration usb: dwc2: Fix channel disable flow usb: dwc2: Set actual frame number for completed ISOC transfer usb: gadget: do not use __constant_cpu_to_le16 usb: dwc2: gadget: Increase descriptors count for ISOC's usb: introduce usb_ep_type_string() function usb: dwc3: move synchronize_irq() out of the spinlock protected block ...
Diffstat (limited to 'include/linux/usb/tcpm.h')
-rw-r--r--include/linux/usb/tcpm.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h
index 0c532ca3f079..36a15dcadc53 100644
--- a/include/linux/usb/tcpm.h
+++ b/include/linux/usb/tcpm.h
@@ -121,10 +121,10 @@ struct tcpc_config {
121 * with partner. 121 * with partner.
122 * @set_pd_rx: Called to enable or disable reception of PD messages 122 * @set_pd_rx: Called to enable or disable reception of PD messages
123 * @set_roles: Called to set power and data roles 123 * @set_roles: Called to set power and data roles
124 * @start_drp_toggling: 124 * @start_toggling:
125 * Optional; if supported by hardware, called to start DRP 125 * Optional; if supported by hardware, called to start dual-role
126 * toggling. DRP toggling is stopped automatically if 126 * toggling or single-role connection detection. Toggling stops
127 * a connection is established. 127 * automatically if a connection is established.
128 * @try_role: Optional; called to set a preferred role 128 * @try_role: Optional; called to set a preferred role
129 * @pd_transmit:Called to transmit PD message 129 * @pd_transmit:Called to transmit PD message
130 * @mux: Pointer to multiplexer data 130 * @mux: Pointer to multiplexer data
@@ -147,8 +147,9 @@ struct tcpc_dev {
147 int (*set_pd_rx)(struct tcpc_dev *dev, bool on); 147 int (*set_pd_rx)(struct tcpc_dev *dev, bool on);
148 int (*set_roles)(struct tcpc_dev *dev, bool attached, 148 int (*set_roles)(struct tcpc_dev *dev, bool attached,
149 enum typec_role role, enum typec_data_role data); 149 enum typec_role role, enum typec_data_role data);
150 int (*start_drp_toggling)(struct tcpc_dev *dev, 150 int (*start_toggling)(struct tcpc_dev *dev,
151 enum typec_cc_status cc); 151 enum typec_port_type port_type,
152 enum typec_cc_status cc);
152 int (*try_role)(struct tcpc_dev *dev, int role); 153 int (*try_role)(struct tcpc_dev *dev, int role);
153 int (*pd_transmit)(struct tcpc_dev *dev, enum tcpm_transmit_type type, 154 int (*pd_transmit)(struct tcpc_dev *dev, enum tcpm_transmit_type type,
154 const struct pd_message *msg); 155 const struct pd_message *msg);