diff mbox series

[v5,10/15] USB: typec: Add port registration for tps25750

Message ID 20230917152639.21443-11-alkuor@gmail.com
State New
Headers show
Series Add TPS25750 USB type-C PD controller support | expand

Commit Message

Abdel Alkuor Sept. 17, 2023, 3:26 p.m. UTC 
From: Abdel Alkuor <abdelalkuor@geotab.com>

TPS25750 doesn't have system configuration register to get dr/pr of the
current applied binary configuration.

Get data role from the device node and power role from PD status register.

Signed-off-by: Abdel Alkuor <abdelalkuor@geotab.com>
---
 drivers/usb/typec/tipd/core.c     | 61 ++++++++++++++++++++++++++++++-
 drivers/usb/typec/tipd/tps6598x.h | 10 +++++
 2 files changed, 70 insertions(+), 1 deletion(-)

Comments

Heikki Krogerus Sept. 18, 2023, 12:58 p.m. UTC | #1 
On Sun, Sep 17, 2023 at 11:26:34AM -0400, Abdel Alkuor wrote:
> From: Abdel Alkuor <abdelalkuor@geotab.com>
> 
> TPS25750 doesn't have system configuration register to get dr/pr of the
> current applied binary configuration.
> 
> Get data role from the device node and power role from PD status register.
> 
> Signed-off-by: Abdel Alkuor <abdelalkuor@geotab.com>
> ---
>  drivers/usb/typec/tipd/core.c     | 61 ++++++++++++++++++++++++++++++-
>  drivers/usb/typec/tipd/tps6598x.h | 10 +++++
>  2 files changed, 70 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 8218d88a4a06..a97fda68cb54 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -39,6 +39,7 @@
>  #define TPS_REG_CTRL_CONF		0x29
>  #define TPS_REG_BOOT_STATUS		0x2D
>  #define TPS_REG_POWER_STATUS		0x3f
> +#define TPS_REG_PD_STATUS		0x40
>  #define TPS_REG_RX_IDENTITY_SOP		0x48
>  #define TPS_REG_DATA_STATUS		0x5f
>  
> @@ -1028,6 +1029,60 @@ tps6598x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
>  	return 0;
>  }
>  
> +static int
> +tps25750_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
> +{
> +	struct typec_capability typec_cap = { };
> +	const char *data_role;
> +	u8 pd_status;
> +	int ret;
> +
> +	ret = tps6598x_read8(tps, TPS_REG_PD_STATUS, &pd_status);
> +	if (ret)
> +		return ret;
> +
> +	ret = fwnode_property_read_string(fwnode, "data-role", &data_role);
> +	if (ret) {
> +		dev_err(tps->dev, "data-role not found: %d\n", ret);
> +		return ret;
> +	}
> +
> +	ret = typec_find_port_data_role(data_role);
> +	if (ret < 0) {
> +		dev_err(tps->dev, "unknown data-role: %s\n", data_role);
> +		return ret;
> +	}
> +
> +	typec_cap.data = ret;
> +	typec_cap.revision = USB_TYPEC_REV_1_3;
> +	typec_cap.pd_revision = 0x300;
> +	typec_cap.driver_data = tps;
> +	typec_cap.ops = &tps6598x_ops;
> +	typec_cap.fwnode = fwnode;
> +	typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> +
> +	switch (TPS_PD_STATUS_PORT_TYPE(pd_status)) {
> +	case TPS_PD_STATUS_PORT_TYPE_SINK_SOURCE:
> +	case TPS_PD_STATUS_PORT_TYPE_SOURCE_SINK:
> +		typec_cap.type = TYPEC_PORT_DRP;
> +		break;
> +	case TPS_PD_STATUS_PORT_TYPE_SINK:
> +		typec_cap.type = TYPEC_PORT_SNK;
> +		break;
> +	case TPS_PD_STATUS_PORT_TYPE_SOURCE:
> +		typec_cap.type = TYPEC_PORT_SRC;
> +		break;
> +	default:
> +		return -ENODEV;
> +	}
> +
> +	tps->port = typec_register_port(tps->dev, &typec_cap);
> +	if (IS_ERR(tps->port))
> +		return PTR_ERR(tps->port);
> +
> +	return 0;
> +}
> +
>  static int tps6598x_probe(struct i2c_client *client)
>  {
>  	irq_handler_t irq_handler = tps6598x_interrupt;
> @@ -1124,7 +1179,11 @@ static int tps6598x_probe(struct i2c_client *client)
>  	if (ret)
>  		goto err_role_put;
>  
> -	ret = tps6598x_register_port(tps, fwnode);
> +	if (np && of_device_is_compatible(np, "ti,tps25750"))

Why aren't you using is_tps25750 here?

> +		ret = tps25750_register_port(tps, fwnode);
> +	else
> +		ret = tps6598x_register_port(tps, fwnode);
> +
>  	if (ret)
>  		goto err_role_put;

thanks,
Abdel Alkuor Sept. 20, 2023, 2:53 p.m. UTC | #2 
On Mon, Sep 18, 2023 at 03:58:15PM +0300, Heikki Krogerus wrote:
> On Sun, Sep 17, 2023 at 11:26:34AM -0400, Abdel Alkuor wrote:
> > From: Abdel Alkuor <abdelalkuor@geotab.com>
> > 
> > TPS25750 doesn't have system configuration register to get dr/pr of the
> > current applied binary configuration.
> > 
> > Get data role from the device node and power role from PD status register.
> > 
> > Signed-off-by: Abdel Alkuor <abdelalkuor@geotab.com>
> > ---
> >  drivers/usb/typec/tipd/core.c     | 61 ++++++++++++++++++++++++++++++-
> >  drivers/usb/typec/tipd/tps6598x.h | 10 +++++
> >  2 files changed, 70 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> > index 8218d88a4a06..a97fda68cb54 100644
> > --- a/drivers/usb/typec/tipd/core.c
> > +++ b/drivers/usb/typec/tipd/core.c
> > @@ -39,6 +39,7 @@
> >  #define TPS_REG_CTRL_CONF		0x29
> >  #define TPS_REG_BOOT_STATUS		0x2D
> >  #define TPS_REG_POWER_STATUS		0x3f
> > +#define TPS_REG_PD_STATUS		0x40
> >  #define TPS_REG_RX_IDENTITY_SOP		0x48
> >  #define TPS_REG_DATA_STATUS		0x5f
> >  
> > @@ -1028,6 +1029,60 @@ tps6598x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
> >  	return 0;
> >  }
> >  
> > +static int
> > +tps25750_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
> > +{
> > +	struct typec_capability typec_cap = { };
> > +	const char *data_role;
> > +	u8 pd_status;
> > +	int ret;
> > +
> > +	ret = tps6598x_read8(tps, TPS_REG_PD_STATUS, &pd_status);
> > +	if (ret)
> > +		return ret;
> > +
> > +	ret = fwnode_property_read_string(fwnode, "data-role", &data_role);
> > +	if (ret) {
> > +		dev_err(tps->dev, "data-role not found: %d\n", ret);
> > +		return ret;
> > +	}
> > +
> > +	ret = typec_find_port_data_role(data_role);
> > +	if (ret < 0) {
> > +		dev_err(tps->dev, "unknown data-role: %s\n", data_role);
> > +		return ret;
> > +	}
> > +
> > +	typec_cap.data = ret;
> > +	typec_cap.revision = USB_TYPEC_REV_1_3;
> > +	typec_cap.pd_revision = 0x300;
> > +	typec_cap.driver_data = tps;
> > +	typec_cap.ops = &tps6598x_ops;
> > +	typec_cap.fwnode = fwnode;
> > +	typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> > +
> > +	switch (TPS_PD_STATUS_PORT_TYPE(pd_status)) {
> > +	case TPS_PD_STATUS_PORT_TYPE_SINK_SOURCE:
> > +	case TPS_PD_STATUS_PORT_TYPE_SOURCE_SINK:
> > +		typec_cap.type = TYPEC_PORT_DRP;
> > +		break;
> > +	case TPS_PD_STATUS_PORT_TYPE_SINK:
> > +		typec_cap.type = TYPEC_PORT_SNK;
> > +		break;
> > +	case TPS_PD_STATUS_PORT_TYPE_SOURCE:
> > +		typec_cap.type = TYPEC_PORT_SRC;
> > +		break;
> > +	default:
> > +		return -ENODEV;
> > +	}
> > +
> > +	tps->port = typec_register_port(tps->dev, &typec_cap);
> > +	if (IS_ERR(tps->port))
> > +		return PTR_ERR(tps->port);
> > +
> > +	return 0;
> > +}
> > +
> >  static int tps6598x_probe(struct i2c_client *client)
> >  {
> >  	irq_handler_t irq_handler = tps6598x_interrupt;
> > @@ -1124,7 +1179,11 @@ static int tps6598x_probe(struct i2c_client *client)
> >  	if (ret)
> >  		goto err_role_put;
> >  
> > -	ret = tps6598x_register_port(tps, fwnode);
> > +	if (np && of_device_is_compatible(np, "ti,tps25750"))
> 
> Why aren't you using is_tps25750 here?
Ops, I missed that. Will be fixed in v6.
> 
> > +		ret = tps25750_register_port(tps, fwnode);
> > +	else
> > +		ret = tps6598x_register_port(tps, fwnode);
> > +
> >  	if (ret)
> >  		goto err_role_put;
> 
> thanks,
> 
> -- 
> heikki

Thanks,
Abdel
diff mbox series

Patch

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 8218d88a4a06..a97fda68cb54 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -39,6 +39,7 @@ 
 #define TPS_REG_CTRL_CONF		0x29
 #define TPS_REG_BOOT_STATUS		0x2D
 #define TPS_REG_POWER_STATUS		0x3f
+#define TPS_REG_PD_STATUS		0x40
 #define TPS_REG_RX_IDENTITY_SOP		0x48
 #define TPS_REG_DATA_STATUS		0x5f
 
@@ -1028,6 +1029,60 @@  tps6598x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
 	return 0;
 }
 
+static int
+tps25750_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
+{
+	struct typec_capability typec_cap = { };
+	const char *data_role;
+	u8 pd_status;
+	int ret;
+
+	ret = tps6598x_read8(tps, TPS_REG_PD_STATUS, &pd_status);
+	if (ret)
+		return ret;
+
+	ret = fwnode_property_read_string(fwnode, "data-role", &data_role);
+	if (ret) {
+		dev_err(tps->dev, "data-role not found: %d\n", ret);
+		return ret;
+	}
+
+	ret = typec_find_port_data_role(data_role);
+	if (ret < 0) {
+		dev_err(tps->dev, "unknown data-role: %s\n", data_role);
+		return ret;
+	}
+
+	typec_cap.data = ret;
+	typec_cap.revision = USB_TYPEC_REV_1_3;
+	typec_cap.pd_revision = 0x300;
+	typec_cap.driver_data = tps;
+	typec_cap.ops = &tps6598x_ops;
+	typec_cap.fwnode = fwnode;
+	typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
+
+	switch (TPS_PD_STATUS_PORT_TYPE(pd_status)) {
+	case TPS_PD_STATUS_PORT_TYPE_SINK_SOURCE:
+	case TPS_PD_STATUS_PORT_TYPE_SOURCE_SINK:
+		typec_cap.type = TYPEC_PORT_DRP;
+		break;
+	case TPS_PD_STATUS_PORT_TYPE_SINK:
+		typec_cap.type = TYPEC_PORT_SNK;
+		break;
+	case TPS_PD_STATUS_PORT_TYPE_SOURCE:
+		typec_cap.type = TYPEC_PORT_SRC;
+		break;
+	default:
+		return -ENODEV;
+	}
+
+	tps->port = typec_register_port(tps->dev, &typec_cap);
+	if (IS_ERR(tps->port))
+		return PTR_ERR(tps->port);
+
+	return 0;
+}
+
 static int tps6598x_probe(struct i2c_client *client)
 {
 	irq_handler_t irq_handler = tps6598x_interrupt;
@@ -1124,7 +1179,11 @@  static int tps6598x_probe(struct i2c_client *client)
 	if (ret)
 		goto err_role_put;
 
-	ret = tps6598x_register_port(tps, fwnode);
+	if (np && of_device_is_compatible(np, "ti,tps25750"))
+		ret = tps25750_register_port(tps, fwnode);
+	else
+		ret = tps6598x_register_port(tps, fwnode);
+
 	if (ret)
 		goto err_role_put;
 
diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h
index 362e1eca53ad..d2c65387994f 100644
--- a/drivers/usb/typec/tipd/tps6598x.h
+++ b/drivers/usb/typec/tipd/tps6598x.h
@@ -203,4 +203,14 @@ 
 #define TPS_BOOT_STATUS_DEAD_BATTERY_FLAG	BIT(2)
 #define TPS25750_BOOT_STATUS_I2C_EEPROM_PRESENT	BIT(3)
 
+/* PD STATUS REG */
+#define TPS_REG_PD_STATUS_PORT_TYPE_MASK	GENMASK(5, 4)
+#define TPS_PD_STATUS_PORT_TYPE(x) \
+	TPS_FIELD_GET(TPS_REG_PD_STATUS_PORT_TYPE_MASK, x)
+
+#define TPS_PD_STATUS_PORT_TYPE_SINK_SOURCE	0
+#define TPS_PD_STATUS_PORT_TYPE_SINK		1
+#define TPS_PD_STATUS_PORT_TYPE_SOURCE		2
+#define TPS_PD_STATUS_PORT_TYPE_SOURCE_SINK	3
+
 #endif /* __TPS6598X_H__ */