extcon: usbc-tusb320: Make typec-power-opmode optional

[PATCH] extcon: usbc-tusb320: Make typec-power-opmode optional

Posted by Yannis Bolliger 3 months, 3 weeks ago

The driver returned an error in the probe function when a usb c
connector is configured in the DT without a "typec-power-opmode"
property. This property is used to initialize the CURRENT_MODE_ADVERTISE
register of the TUSB320, which is unused when operating as a UFP.
Requiring this property causes unnecessary configuration overhead and
inconsistency with the USB connector DT bindings, which do not specify
it as required.

This change makes typec-power-opmode optional. When the property is not
present, the driver will skip programming the CURRENT_MODE_ADVERTISE
register and rely on the hardware default.

Signed-off-by: Yannis Bolliger <yannis.bolliger@protonmail.com>
---
 drivers/extcon/extcon-usbc-tusb320.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/extcon/extcon-usbc-tusb320.c b/drivers/extcon/extcon-usbc-tusb320.c
index 2eab341de6b7..b8ff91010e63 100644
--- a/drivers/extcon/extcon-usbc-tusb320.c
+++ b/drivers/extcon/extcon-usbc-tusb320.c
@@ -454,20 +454,17 @@ static int tusb320_typec_probe(struct i2c_client *client,
 	priv->port_type = priv->cap.type;
 
 	/* This goes into register 0x8 field CURRENT_MODE_ADVERTISE */
-	ret = fwnode_property_read_string(connector, "typec-power-opmode", &cap_str);
-	if (ret)
-		goto err_put;
-
-	ret = typec_find_pwr_opmode(cap_str);
-	if (ret < 0)
-		goto err_put;
-
-	priv->pwr_opmode = ret;
-
-	/* Initialize the hardware with the devicetree settings. */
-	ret = tusb320_set_adv_pwr_mode(priv);
-	if (ret)
-		goto err_put;
+	if (!fwnode_property_read_string(connector, "typec-power-opmode",
+					 &cap_str)) {
+		ret = typec_find_pwr_opmode(cap_str);
+		if (ret < 0)
+			goto err_put;
+		priv->pwr_opmode = ret;
+		/* Initialize the hardware with the devicetree settings. */
+		ret = tusb320_set_adv_pwr_mode(priv);
+		if (ret)
+			goto err_put;
+	}
 
 	priv->cap.revision		= USB_TYPEC_REV_1_1;
 	priv->cap.accessory[0]		= TYPEC_ACCESSORY_AUDIO;
-- 
2.51.0

Re: [PATCH] extcon: usbc-tusb320: Make typec-power-opmode optional

Posted by Chanwoo Choi 2 months, 2 weeks ago

25. 10. 18. 04:30에 Yannis Bolliger 이(가) 쓴 글:
> The driver returned an error in the probe function when a usb c
> connector is configured in the DT without a "typec-power-opmode"
> property. This property is used to initialize the CURRENT_MODE_ADVERTISE
> register of the TUSB320, which is unused when operating as a UFP.
> Requiring this property causes unnecessary configuration overhead and
> inconsistency with the USB connector DT bindings, which do not specify
> it as required.
> 
> This change makes typec-power-opmode optional. When the property is not
> present, the driver will skip programming the CURRENT_MODE_ADVERTISE
> register and rely on the hardware default.
> 
> Signed-off-by: Yannis Bolliger <yannis.bolliger@protonmail.com>
> ---
>  drivers/extcon/extcon-usbc-tusb320.c | 25 +++++++++++--------------
>  1 file changed, 11 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-usbc-tusb320.c b/drivers/extcon/extcon-usbc-tusb320.c
> index 2eab341de6b7..b8ff91010e63 100644
> --- a/drivers/extcon/extcon-usbc-tusb320.c
> +++ b/drivers/extcon/extcon-usbc-tusb320.c
> @@ -454,20 +454,17 @@ static int tusb320_typec_probe(struct i2c_client *client,
>  	priv->port_type = priv->cap.type;
>  
>  	/* This goes into register 0x8 field CURRENT_MODE_ADVERTISE */
> -	ret = fwnode_property_read_string(connector, "typec-power-opmode", &cap_str);
> -	if (ret)
> -		goto err_put;
> -
> -	ret = typec_find_pwr_opmode(cap_str);
> -	if (ret < 0)
> -		goto err_put;
> -
> -	priv->pwr_opmode = ret;
> -
> -	/* Initialize the hardware with the devicetree settings. */
> -	ret = tusb320_set_adv_pwr_mode(priv);
> -	if (ret)
> -		goto err_put;
> +	if (!fwnode_property_read_string(connector, "typec-power-opmode",
> +					 &cap_str)) {
> +		ret = typec_find_pwr_opmode(cap_str);
> +		if (ret < 0)
> +			goto err_put;
> +		priv->pwr_opmode = ret;
> +		/* Initialize the hardware with the devicetree settings. */
> +		ret = tusb320_set_adv_pwr_mode(priv);
> +		if (ret)
> +			goto err_put;
> +	}
>  
>  	priv->cap.revision		= USB_TYPEC_REV_1_1;
>  	priv->cap.accessory[0]		= TYPEC_ACCESSORY_AUDIO;

Applied it. Thanks.

-- 
Best Regards,
Samsung Electronics
Chanwoo Choi