Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2000016c authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm: Use new Type-C switch/mux and usb-role-switch functions 



Remove the unused (not implemented anywhere) tcpc_mux_dev abstraction
and replace it with calling the new typec_set_orientation,
usb_role_switch_set and typec_set_mode functions.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6962c29

drivers/usb/typec/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ if TYPEC 
config TYPEC_TCPM

	tristate "USB Type-C Port Controller Manager"

	depends on USB

	select USB_ROLE_SWITCH

	help

	  The Type-C Port Controller Manager provides a USB PD and USB Type-C

	  state machine for use with Type-C Port Controllers.

drivers/usb/typec/fusb302/fusb302.c

+0 −1
Original line number Diff line number Diff line
@@ -1239,7 +1239,6 @@ static void init_tcpc_dev(struct tcpc_dev *fusb302_tcpc_dev) 
	fusb302_tcpc_dev->set_roles = tcpm_set_roles;

	fusb302_tcpc_dev->start_drp_toggling = tcpm_start_drp_toggling;

	fusb302_tcpc_dev->pd_transmit = tcpm_pd_transmit;

	fusb302_tcpc_dev->mux = NULL;

}



static const char * const cc_polarity_name[] = {

drivers/usb/typec/tcpm.c

+35 −11
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/usb/pd.h>

#include <linux/usb/pd_bdo.h>

#include <linux/usb/pd_vdo.h>

#include <linux/usb/role.h>

#include <linux/usb/tcpm.h>

#include <linux/usb/typec.h>

#include <linux/workqueue.h>
@@ -176,6 +177,7 @@ struct tcpm_port { 
	struct typec_port *typec_port;



	struct tcpc_dev	*tcpc;

	struct usb_role_switch *role_sw;



	enum typec_role vconn_role;

	enum typec_role pwr_role;
@@ -604,20 +606,27 @@ void tcpm_pd_transmit_complete(struct tcpm_port *port, 
EXPORT_SYMBOL_GPL(tcpm_pd_transmit_complete);



static int tcpm_mux_set(struct tcpm_port *port, enum tcpc_mux_mode mode,

			enum usb_role usb_role)

			enum usb_role usb_role,

			enum typec_orientation orientation)

{

	int ret = 0;

	int ret;



	tcpm_log(port, "Requesting mux mode %d, usb-role %d, polarity %d",

		 mode, usb_role, port->polarity);

	tcpm_log(port, "Requesting mux mode %d, usb-role %d, orientation %d",

		 mode, usb_role, orientation);



	if (port->tcpc->mux)

		ret = port->tcpc->mux->set(port->tcpc->mux, mode, usb_role,

					   port->polarity);

	ret = typec_set_orientation(port->typec_port, orientation);

	if (ret)

		return ret;



	if (port->role_sw) {

		ret = usb_role_switch_set_role(port->role_sw, usb_role);

		if (ret)

			return ret;

	}



	return typec_set_mode(port->typec_port, mode);

}



static int tcpm_set_polarity(struct tcpm_port *port,

			     enum typec_cc_polarity polarity)

{
@@ -728,15 +737,21 @@ static int tcpm_set_attached_state(struct tcpm_port *port, bool attached) 
static int tcpm_set_roles(struct tcpm_port *port, bool attached,

			  enum typec_role role, enum typec_data_role data)

{

	enum typec_orientation orientation;

	enum usb_role usb_role;

	int ret;



	if (port->polarity == TYPEC_POLARITY_CC1)

		orientation = TYPEC_ORIENTATION_NORMAL;

	else

		orientation = TYPEC_ORIENTATION_REVERSE;



	if (data == TYPEC_HOST)

		usb_role = USB_ROLE_HOST;

	else

		usb_role = USB_ROLE_DEVICE;



	ret = tcpm_mux_set(port, TYPEC_MUX_USB, usb_role);

	ret = tcpm_mux_set(port, TYPEC_MUX_USB, usb_role, orientation);

	if (ret < 0)

		return ret;
@@ -2029,7 +2044,8 @@ static int tcpm_src_attach(struct tcpm_port *port) 
out_disable_pd:

	port->tcpc->set_pd_rx(port->tcpc, false);

out_disable_mux:

	tcpm_mux_set(port, TYPEC_MUX_NONE, USB_ROLE_NONE);

	tcpm_mux_set(port, TYPEC_MUX_NONE, USB_ROLE_NONE,

		     TYPEC_ORIENTATION_NONE);

	return ret;

}
@@ -2073,7 +2089,8 @@ 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, USB_ROLE_NONE);

	tcpm_mux_set(port, TYPEC_MUX_NONE, USB_ROLE_NONE,

		     TYPEC_ORIENTATION_NONE);

	tcpm_set_attached_state(port, false);

	port->try_src_count = 0;

	port->try_snk_count = 0;
@@ -3653,6 +3670,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) 
	port->partner_desc.identity = &port->partner_ident;

	port->port_type = tcpc->config->type;



	port->role_sw = usb_role_switch_get(port->dev);

	if (IS_ERR(port->role_sw)) {

		err = PTR_ERR(port->role_sw);

		goto out_destroy_wq;

	}



	port->typec_port = typec_register_port(port->dev, &port->typec_caps);

	if (IS_ERR(port->typec_port)) {

		err = PTR_ERR(port->typec_port);
@@ -3688,6 +3711,7 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) 
	return port;



out_destroy_wq:

	usb_role_switch_put(port->role_sw);

	destroy_workqueue(port->wq);

	return ERR_PTR(err);

}

include/linux/usb/tcpm.h

+0 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#define __LINUX_USB_TCPM_H



#include <linux/bitops.h>

#include <linux/usb/role.h>

#include <linux/usb/typec.h>

#include "pd.h"
@@ -113,14 +112,6 @@ enum tcpc_mux_mode { 
			  TCPC_MUX_DP_ENABLED,

};



struct tcpc_mux_dev {

	int (*set)(struct tcpc_mux_dev *dev, enum tcpc_mux_mode mux_mode,

		   enum usb_role usb_role,

		   enum typec_cc_polarity polarity);

	bool dfp_only;

	void *priv_data;

};



/**

 * struct tcpc_dev - Port configuration and callback functions

 * @config:	Pointer to port configuration
@@ -172,7 +163,6 @@ struct tcpc_dev { 
	int (*try_role)(struct tcpc_dev *dev, int role);

	int (*pd_transmit)(struct tcpc_dev *dev, enum tcpm_transmit_type type,

			   const struct pd_message *msg);

	struct tcpc_mux_dev *mux;

};



struct tcpm_port;