On Sun, Oct 01, 2023 at 04:11:29AM -0400, Abdel Alkuor wrote:
> From: Abdel Alkuor <abdelalkuor@xxxxxxxxxx>
>
> tps6598x and cd321x use TPS_REG_SYSTEM_CONF to get dr/pr roles
> where other similar devices don't have this register such as tps25750.
>
> Move tps6598x port registration to its own function
>
> Signed-off-by: Abdel Alkuor <abdelalkuor@xxxxxxxxxx>
This one can be moved to the beginning of the series.
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> Changes in v9:
> - No changes
> Changes in v8:
> - No changes
> Changes in v7:
> - Add driver name to commit subject
> Changes in v6:
> - No changes
> Changes in v5:
> - Incorporating tps25750 into tps6598x driver
>
> drivers/usb/typec/tipd/core.c | 99 +++++++++++++++++++----------------
> 1 file changed, 54 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 52dc1cc16bed..0195eabd96bf 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -1032,14 +1032,64 @@ static int tps25750_apply_patch(struct tps6598x *tps)
> return 0;
> };
>
> +static int
> +tps6598x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
> +{
> + int ret;
> + u32 conf;
> + struct typec_capability typec_cap = { };
> +
> + ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf);
> + if (ret)
> + return ret;
> +
> + typec_cap.revision = USB_TYPEC_REV_1_2;
> + typec_cap.pd_revision = 0x200;
> + typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> + typec_cap.driver_data = tps;
> + typec_cap.ops = &tps6598x_ops;
> + typec_cap.fwnode = fwnode;
> +
> + switch (TPS_SYSCONF_PORTINFO(conf)) {
> + case TPS_PORTINFO_SINK_ACCESSORY:
> + case TPS_PORTINFO_SINK:
> + typec_cap.type = TYPEC_PORT_SNK;
> + typec_cap.data = TYPEC_PORT_UFP;
> + break;
> + case TPS_PORTINFO_DRP_UFP_DRD:
> + case TPS_PORTINFO_DRP_DFP_DRD:
> + typec_cap.type = TYPEC_PORT_DRP;
> + typec_cap.data = TYPEC_PORT_DRD;
> + break;
> + case TPS_PORTINFO_DRP_UFP:
> + typec_cap.type = TYPEC_PORT_DRP;
> + typec_cap.data = TYPEC_PORT_UFP;
> + break;
> + case TPS_PORTINFO_DRP_DFP:
> + typec_cap.type = TYPEC_PORT_DRP;
> + typec_cap.data = TYPEC_PORT_DFP;
> + break;
> + case TPS_PORTINFO_SOURCE:
> + typec_cap.type = TYPEC_PORT_SRC;
> + typec_cap.data = TYPEC_PORT_DFP;
> + 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)
> {
> struct device_node *np = client->dev.of_node;
> - struct typec_capability typec_cap = { };
> struct tps6598x *tps;
> struct fwnode_handle *fwnode;
> u32 status;
> - u32 conf;
> u32 vid;
> int ret;
> u64 mask1;
> @@ -1112,10 +1162,6 @@ static int tps6598x_probe(struct i2c_client *client)
> goto err_clear_mask;
> trace_tps6598x_status(status);
>
> - ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf);
> - if (ret < 0)
> - goto err_clear_mask;
> -
> /*
> * This fwnode has a "compatible" property, but is never populated as a
> * struct device. Instead we simply parse it to read the properties.
> @@ -1133,50 +1179,13 @@ static int tps6598x_probe(struct i2c_client *client)
> goto err_fwnode_put;
> }
>
> - typec_cap.revision = USB_TYPEC_REV_1_2;
> - typec_cap.pd_revision = 0x200;
> - typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> - typec_cap.driver_data = tps;
> - typec_cap.ops = &tps6598x_ops;
> - typec_cap.fwnode = fwnode;
> -
> - switch (TPS_SYSCONF_PORTINFO(conf)) {
> - case TPS_PORTINFO_SINK_ACCESSORY:
> - case TPS_PORTINFO_SINK:
> - typec_cap.type = TYPEC_PORT_SNK;
> - typec_cap.data = TYPEC_PORT_UFP;
> - break;
> - case TPS_PORTINFO_DRP_UFP_DRD:
> - case TPS_PORTINFO_DRP_DFP_DRD:
> - typec_cap.type = TYPEC_PORT_DRP;
> - typec_cap.data = TYPEC_PORT_DRD;
> - break;
> - case TPS_PORTINFO_DRP_UFP:
> - typec_cap.type = TYPEC_PORT_DRP;
> - typec_cap.data = TYPEC_PORT_UFP;
> - break;
> - case TPS_PORTINFO_DRP_DFP:
> - typec_cap.type = TYPEC_PORT_DRP;
> - typec_cap.data = TYPEC_PORT_DFP;
> - break;
> - case TPS_PORTINFO_SOURCE:
> - typec_cap.type = TYPEC_PORT_SRC;
> - typec_cap.data = TYPEC_PORT_DFP;
> - break;
> - default:
> - ret = -ENODEV;
> - goto err_role_put;
> - }
> -
> ret = devm_tps6598_psy_register(tps);
> if (ret)
> goto err_role_put;
>
> - tps->port = typec_register_port(&client->dev, &typec_cap);
> - if (IS_ERR(tps->port)) {
> - ret = PTR_ERR(tps->port);
> + ret = tps6598x_register_port(tps, fwnode);
> + if (ret)
> goto err_role_put;
> - }
>
> if (status & TPS_STATUS_PLUG_PRESENT) {
> ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &tps->pwr_status);
> --
> 2.34.1
--
heikki
