On Thu, Aug 21, 2025 at 03:39:01PM +0000, Sven Peter wrote:
> Since the irq mask was originally added more tipd variants have been
> introduced and there's now struct tipd_data. Move the initial mask in
> there.
>
> Signed-off-by: Sven Peter <sven@xxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/tipd/core.c | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 1c80296c3b273e24ceacb3feff432c4f6e6835cc..6d8bcbc9cad8a1394e066504d4c5ca570edd4e4f 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -112,6 +112,7 @@ struct tps6598x;
>
> struct tipd_data {
> irq_handler_t irq_handler;
> + u64 irq_mask1;
> int (*register_port)(struct tps6598x *tps, struct fwnode_handle *node);
> void (*trace_power_status)(u16 status);
> void (*trace_status)(u32 status);
> @@ -1298,7 +1299,6 @@ static int tps6598x_probe(struct i2c_client *client)
> u32 status;
> u32 vid;
> int ret;
> - u64 mask1;
>
> tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
> if (!tps)
> @@ -1337,16 +1337,6 @@ static int tps6598x_probe(struct i2c_client *client)
> if (ret)
> return ret;
>
> - /* CD321X chips have all interrupts masked initially */
> - mask1 = APPLE_CD_REG_INT_POWER_STATUS_UPDATE |
> - APPLE_CD_REG_INT_DATA_STATUS_UPDATE |
> - APPLE_CD_REG_INT_PLUG_EVENT;
> -
> - } else {
> - /* Enable power status, data status and plug event interrupts */
> - mask1 = TPS_REG_INT_POWER_STATUS_UPDATE |
> - TPS_REG_INT_DATA_STATUS_UPDATE |
> - TPS_REG_INT_PLUG_EVENT;
> }
>
> tps->data = i2c_get_match_data(client);
> @@ -1364,7 +1354,7 @@ static int tps6598x_probe(struct i2c_client *client)
> return ret;
> }
>
> - ret = tps6598x_write64(tps, TPS_REG_INT_MASK1, mask1);
> + ret = tps6598x_write64(tps, TPS_REG_INT_MASK1, tps->data->irq_mask1);
> if (ret)
> goto err_reset_controller;
>
> @@ -1527,6 +1517,9 @@ static const struct dev_pm_ops tps6598x_pm_ops = {
>
> static const struct tipd_data cd321x_data = {
> .irq_handler = cd321x_interrupt,
> + .irq_mask1 = APPLE_CD_REG_INT_POWER_STATUS_UPDATE |
> + APPLE_CD_REG_INT_DATA_STATUS_UPDATE |
> + APPLE_CD_REG_INT_PLUG_EVENT,
> .register_port = tps6598x_register_port,
> .trace_power_status = trace_tps6598x_power_status,
> .trace_status = trace_tps6598x_status,
> @@ -1536,6 +1529,9 @@ static const struct tipd_data cd321x_data = {
>
> static const struct tipd_data tps6598x_data = {
> .irq_handler = tps6598x_interrupt,
> + .irq_mask1 = TPS_REG_INT_POWER_STATUS_UPDATE |
> + TPS_REG_INT_DATA_STATUS_UPDATE |
> + TPS_REG_INT_PLUG_EVENT,
> .register_port = tps6598x_register_port,
> .trace_power_status = trace_tps6598x_power_status,
> .trace_status = trace_tps6598x_status,
> @@ -1546,6 +1542,9 @@ static const struct tipd_data tps6598x_data = {
>
> static const struct tipd_data tps25750_data = {
> .irq_handler = tps25750_interrupt,
> + .irq_mask1 = TPS_REG_INT_POWER_STATUS_UPDATE |
> + TPS_REG_INT_DATA_STATUS_UPDATE |
> + TPS_REG_INT_PLUG_EVENT,
> .register_port = tps25750_register_port,
> .trace_power_status = trace_tps25750_power_status,
> .trace_status = trace_tps25750_status,
>
> --
> 2.34.1
>
--
heikki
