Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1730081
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v2 08/11] staging: typec: tcpm: Set mux to device mode when configured as such |
| Date | 2017-09-11 01:00 +0200 |
| Message-ID | <uojmN-28f-1@gated-at.bofh.it> (permalink) |
| References | <umpcZ-5fU-5@gated-at.bofh.it> <umpd2-5fU-47@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 09/05/2017 09:42 AM, Hans de Goede wrote:
> Setting the mux to TYPEC_MUX_NONE, TCPC_USB_SWITCH_DISCONNECT when the
> data-role is device is not correct. Plenty of devices support operating
> as USB device through a (separate) USB device controller.
>
> So this commit instead splits out TYPEC_MUX_USB into TYPEC_MUX_USB_HOST
> and TYPEC_MUX_USB_DEVICE and makes tcpm_set_roles() set the mux
> accordingly.
>
> Likewise TCPC_MUX_DP gets renamed to TCPC_MUX_DP_SRC to make clear that
> this is for configuring the Type-C port as a Display Port source, not a
> sink.
>
> Last this commit makes tcpm_reset_port() to set the mux to
> TYPEC_MUX_NONE, TCPC_USB_SWITCH_DISCONNECT so that it does not and up
> staying in host (and with this commit also device) mode after a detach.
>
This sentence is hard to understand.
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Otherwise
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/staging/typec/tcpm.c | 7 ++++---
> drivers/staging/typec/tcpm.h | 22 ++++++++++++++--------
> 2 files changed, 18 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/typec/tcpm.c b/drivers/staging/typec/tcpm.c
> index 8af62e74d54c..ffe7e26d4ed3 100644
> --- a/drivers/staging/typec/tcpm.c
> +++ b/drivers/staging/typec/tcpm.c
> @@ -752,11 +752,11 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
> int ret;
>
> if (data == TYPEC_HOST)
> - ret = tcpm_mux_set(port, TYPEC_MUX_USB,
> + ret = tcpm_mux_set(port, TYPEC_MUX_USB_HOST,
> TCPC_USB_SWITCH_CONNECT);
> else
> - ret = tcpm_mux_set(port, TYPEC_MUX_NONE,
> - TCPC_USB_SWITCH_DISCONNECT);
> + ret = tcpm_mux_set(port, TYPEC_MUX_USB_DEVICE,
> + TCPC_USB_SWITCH_CONNECT);
> if (ret < 0)
> return ret;
>
> @@ -2025,6 +2025,7 @@ static void tcpm_reset_port(struct tcpm_port *port)
> tcpm_init_vconn(port);
> tcpm_set_current_limit(port, 0, 0);
> tcpm_set_polarity(port, TYPEC_POLARITY_CC1);
> + tcpm_mux_set(port, TYPEC_MUX_NONE, TCPC_USB_SWITCH_DISCONNECT);
> tcpm_set_attached_state(port, false);
> port->try_src_count = 0;
> port->try_snk_count = 0;
> diff --git a/drivers/staging/typec/tcpm.h b/drivers/staging/typec/tcpm.h
> index 7e9a6b7b5cd6..f662eed48c86 100644
> --- a/drivers/staging/typec/tcpm.h
> +++ b/drivers/staging/typec/tcpm.h
> @@ -83,17 +83,23 @@ enum tcpc_usb_switch {
> };
>
> /* Mux state attributes */
> -#define TCPC_MUX_USB_ENABLED BIT(0) /* USB enabled */
> -#define TCPC_MUX_DP_ENABLED BIT(1) /* DP enabled */
> -#define TCPC_MUX_POLARITY_INVERTED BIT(2) /* Polarity inverted */
> +#define TCPC_MUX_USB_DEVICE_ENABLED BIT(0) /* USB device enabled */
> +#define TCPC_MUX_USB_HOST_ENABLED BIT(1) /* USB host enabled */
> +#define TCPC_MUX_DP_SRC_ENABLED BIT(2) /* DP enabled */
> +#define TCPC_MUX_POLARITY_INVERTED BIT(3) /* Polarity inverted */
>
> /* Mux modes, decoded to attributes */
> enum tcpc_mux_mode {
> - TYPEC_MUX_NONE = 0, /* Open switch */
> - TYPEC_MUX_USB = TCPC_MUX_USB_ENABLED, /* USB only */
> - TYPEC_MUX_DP = TCPC_MUX_DP_ENABLED, /* DP only */
> - TYPEC_MUX_DOCK = TCPC_MUX_USB_ENABLED | /* Both USB and DP */
> - TCPC_MUX_DP_ENABLED,
> + /* Open switch */
> + TYPEC_MUX_NONE = 0,
> + /* USB device only */
> + TYPEC_MUX_USB_DEVICE = TCPC_MUX_USB_DEVICE_ENABLED,
> + /* USB host only */
> + TYPEC_MUX_USB_HOST = TCPC_MUX_USB_HOST_ENABLED,
> + /* DP source only */
> + TYPEC_MUX_DP = TCPC_MUX_DP_SRC_ENABLED,
> + /* Both USB host and DP source */
> + TYPEC_MUX_DOCK = TCPC_MUX_USB_HOST_ENABLED | TCPC_MUX_DP_SRC_ENABLED,
> };
>
> struct tcpc_mux_dev {
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/11] mux/typec: Add USB / TypeC mux drivers and hook them up on some x86 systems Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
[PATCH v2 05/11] mux: Add Intel Cherrytrail USB mux driver Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
Re: [PATCH v2 05/11] mux: Add Intel Cherrytrail USB mux driver Hans de Goede <hdegoede@redhat.com> - 2017-09-19 18:40 +0200
Re: [PATCH 1/2] mux: add mux_control_get_optional() API Hans de Goede <hdegoede@redhat.com> - 2017-09-19 20:40 +0200
Re: [PATCH 1/2] mux: add mux_control_get_optional() API Stephen Boyd <stephen.boyd@linaro.org> - 2017-09-20 18:20 +0200
[PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Rob Herring <robh@kernel.org> - 2017-09-13 00:30 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-13 11:00 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Rob Herring <robh@kernel.org> - 2017-09-13 15:40 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-13 16:10 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Rob Herring <robh@kernel.org> - 2017-09-13 17:10 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-13 17:50 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Guenter Roeck <linux@roeck-us.net> - 2017-09-13 18:20 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-25 13:40 +0200
Re: [PATCH v2 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-25 16:20 +0200
[PATCH v2 06/11] mux: Add Pericom PI3USB30532 Type-C mux driver Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
[PATCH v2 09/11] staging: typec: Add Generic TCPC mux driver using the mux subsys Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
[PATCH v2 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg phy mux handling Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
Re: [PATCH v2 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg phy mux handling Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-09-07 15:20 +0200
Re: [PATCH v2 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg phy mux handling Hans de Goede <hdegoede@redhat.com> - 2017-09-07 17:50 +0200
Re: [PATCH v2 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg phy mux handling Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-09-19 14:40 +0200
Re: [PATCH v2 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg phy mux handling Hans de Goede <hdegoede@redhat.com> - 2017-09-21 14:00 +0200
[PATCH v2 03/11] mux: core: Add usb.h header with MUX_USB_* and and MUX_TYPEC_* state constants Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
Re: [PATCH v2 03/11] mux: core: Add usb.h header with MUX_USB_* and and MUX_TYPEC_* state constants Hans de Goede <hdegoede@redhat.com> - 2017-09-08 19:10 +0200
Re: [PATCH v2 03/11] mux: core: Add usb.h header with MUX_USB_* and and MUX_TYPEC_* state constants Hans de Goede <j.w.r.degoede@gmail.com> - 2017-09-21 14:10 +0200
[PATCH v2 08/11] staging: typec: tcpm: Set mux to device mode when configured as such Hans de Goede <hdegoede@redhat.com> - 2017-09-05 18:50 +0200
Re: [PATCH v2 08/11] staging: typec: tcpm: Set mux to device mode when configured as such Guenter Roeck <linux@roeck-us.net> - 2017-09-11 01:00 +0200
Re: [PATCH v2 08/11] staging: typec: tcpm: Set mux to device mode when configured as such Hans de Goede <hdegoede@redhat.com> - 2017-09-22 16:10 +0200
csiph-web