Re: [PATCH RFC 10/22] usb: typec: tipd: Move switch_power_state to tipd_data

[Heikki Krogerus <heikki.krogerus@linux.intel.com>]

On Thu, Aug 21, 2025 at 03:39:02PM +0000, Sven Peter wrote:
> When support for CD321x was originally added no other hardware variant
> was supported and there was no need for struct tipd_data. Now that it
> exists move the special case in there so that we can drop the
> of_device_is_compatible_check entirely.
> 
> Signed-off-by: Sven Peter <sven@kernel.org>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/tipd/core.c | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 6d8bcbc9cad8a1394e066504d4c5ca570edd4e4f..4815c5c462837865a5f9d37bbc139249c82c2f75 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -118,6 +118,7 @@ struct tipd_data {
>  	void (*trace_status)(u32 status);
>  	int (*apply_patch)(struct tps6598x *tps);
>  	int (*init)(struct tps6598x *tps);
> +	int (*switch_power_state)(struct tps6598x *tps, u8 target_state);
>  	int (*reset)(struct tps6598x *tps);
>  };
>  
> @@ -1293,7 +1294,6 @@ tps25750_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
>  
>  static int tps6598x_probe(struct i2c_client *client)
>  {
> -	struct device_node *np = client->dev.of_node;
>  	struct tps6598x *tps;
>  	struct fwnode_handle *fwnode;
>  	u32 status;
> @@ -1331,18 +1331,16 @@ static int tps6598x_probe(struct i2c_client *client)
>  	if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
>  		tps->i2c_protocol = true;
>  
> -	if (np && of_device_is_compatible(np, "apple,cd321x")) {
> -		/* Switch CD321X chips to the correct system power state */
> -		ret = cd321x_switch_power_state(tps, TPS_SYSTEM_POWER_STATE_S0);
> -		if (ret)
> -			return ret;
> -
> -	}
> -
>  	tps->data = i2c_get_match_data(client);
>  	if (!tps->data)
>  		return -EINVAL;
>  
> +	if (tps->data->switch_power_state) {
> +		ret = tps->data->switch_power_state(tps, TPS_SYSTEM_POWER_STATE_S0);
> +		if (ret)
> +			return ret;
> +	}
> +
>  	/* Make sure the controller has application firmware running */
>  	ret = tps6598x_check_mode(tps);
>  	if (ret < 0)
> @@ -1525,6 +1523,7 @@ static const struct tipd_data cd321x_data = {
>  	.trace_status = trace_tps6598x_status,
>  	.init = cd321x_init,
>  	.reset = cd321x_reset,
> +	.switch_power_state = cd321x_switch_power_state,
>  };
>  
>  static const struct tipd_data tps6598x_data = {
> 
> -- 
> 2.34.1
> 

-- 
heikki