Commit 5fed73b8 authored by Prashant Malani's avatar Prashant Malani Committed by Enric Balletbo i Serra
Browse files

platform/chrome: cros_ec_typec: Add struct for port data 



Add a separate struct for storing port data, including Type C connector
class struct pointers and caps.

Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
parent 7110f5f0

drivers/platform/chrome/cros_ec_typec.c

+31 −17
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ 


#define DRV_NAME "cros-ec-typec"



/* Per port data. */

struct cros_typec_port {

	struct typec_port *port;

	/* Initial capabilities for the port. */

	struct typec_capability caps;

};



/* Platform-specific data for the Chrome OS EC Type C controller. */

struct cros_typec_data {

	struct device *dev;
@@ -24,9 +31,7 @@ struct cros_typec_data { 
	int num_ports;

	unsigned int cmd_ver;

	/* Array of ports, indexed by port number. */

	struct typec_port *ports[EC_USB_PD_MAX_PORTS];

	/* Initial capabilities for each port. */

	struct typec_capability *caps[EC_USB_PD_MAX_PORTS];

	struct cros_typec_port *ports[EC_USB_PD_MAX_PORTS];

	struct notifier_block nb;

};
@@ -76,14 +81,25 @@ static int cros_typec_parse_port_props(struct typec_capability *cap, 
	return 0;

}



static void cros_unregister_ports(struct cros_typec_data *typec)

{

	int i;



	for (i = 0; i < typec->num_ports; i++) {

		if (!typec->ports[i])

			continue;

		typec_unregister_port(typec->ports[i]->port);

	}

}



static int cros_typec_init_ports(struct cros_typec_data *typec)

{

	struct device *dev = typec->dev;

	struct typec_capability *cap;

	struct fwnode_handle *fwnode;

	struct cros_typec_port *cros_port;

	const char *port_prop;

	int ret;

	int i;

	int nports;

	u32 port_num = 0;
@@ -115,22 +131,23 @@ static int cros_typec_init_ports(struct cros_typec_data *typec) 


		dev_dbg(dev, "Registering port %d\n", port_num);



		cap = devm_kzalloc(dev, sizeof(*cap), GFP_KERNEL);

		if (!cap) {

		cros_port = devm_kzalloc(dev, sizeof(*cros_port), GFP_KERNEL);

		if (!cros_port) {

			ret = -ENOMEM;

			goto unregister_ports;

		}



		typec->caps[port_num] = cap;

		typec->ports[port_num] = cros_port;

		cap = &cros_port->caps;



		ret = cros_typec_parse_port_props(cap, fwnode, dev);

		if (ret < 0)

			goto unregister_ports;



		typec->ports[port_num] = typec_register_port(dev, cap);

		if (IS_ERR(typec->ports[port_num])) {

		cros_port->port = typec_register_port(dev, cap);

		if (IS_ERR(cros_port->port)) {

			dev_err(dev, "Failed to register port %d\n", port_num);

			ret = PTR_ERR(typec->ports[port_num]);

			ret = PTR_ERR(cros_port->port);

			goto unregister_ports;

		}

	}
@@ -138,8 +155,7 @@ static int cros_typec_init_ports(struct cros_typec_data *typec) 
	return 0;



unregister_ports:

	for (i = 0; i < typec->num_ports; i++)

		typec_unregister_port(typec->ports[i]);

	cros_unregister_ports(typec);

	return ret;

}
@@ -177,7 +193,7 @@ static int cros_typec_ec_command(struct cros_typec_data *typec, 
static void cros_typec_set_port_params_v0(struct cros_typec_data *typec,

		int port_num, struct ec_response_usb_pd_control *resp)

{

	struct typec_port *port = typec->ports[port_num];

	struct typec_port *port = typec->ports[port_num]->port;

	enum typec_orientation polarity;



	if (!resp->enabled)
@@ -194,7 +210,7 @@ static void cros_typec_set_port_params_v0(struct cros_typec_data *typec, 
static void cros_typec_set_port_params_v1(struct cros_typec_data *typec,

		int port_num, struct ec_response_usb_pd_control_v1 *resp)

{

	struct typec_port *port = typec->ports[port_num];

	struct typec_port *port = typec->ports[port_num]->port;

	enum typec_orientation polarity;



	if (!(resp->enabled & PD_CTRL_RESP_ENABLED_CONNECTED))
@@ -358,9 +374,7 @@ static int cros_typec_probe(struct platform_device *pdev) 
	return 0;



unregister_ports:

	for (i = 0; i < typec->num_ports; i++)

		if (typec->ports[i])

			typec_unregister_port(typec->ports[i]);

	cros_unregister_ports(typec);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE