On Wed, Sep 27, 2023 at 01:53:42PM -0400, Abdel Alkuor wrote:
> From: Abdel Alkuor <abdelalkuor@xxxxxxxxxx>
>
> tps25750 event registers structure is different than tps6598x's,
> tps25750 has 11 bytes of events which are read at once where
> tps6598x has two event registers of 8 bytes each which are read
> separately. Likewise MASK event registers. Also, not all events
> are supported in both devices.
>
> Create a new handler to accommodate tps25750 interrupt
>
> Signed-off-by: Abdel Alkuor <abdelalkuor@xxxxxxxxxx>
> ---
> Changes in v7:
> - Add driver name to commit subject
> - Create tps25750 interrupt handler
> Changes in v6:
> - Create tipd callbacks factory
> Changes in v5:
> - Incorporating tps25750 into tps6598x driver
>
> drivers/usb/typec/tipd/core.c | 90 ++++++++++++++++++++++++++++++++---
> 1 file changed, 84 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 56ffffe225f2..40a76826a44e 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -101,6 +101,10 @@ static const char *const modes[] = {
> /* Unrecognized commands will be replaced with "!CMD" */
> #define INVALID_CMD(_cmd_) (_cmd_ == 0x444d4321)
>
> +struct tipd_data {
> + irq_handler_t irq_handler;
> +};
> +
> struct tps6598x {
> struct device *dev;
> struct regmap *regmap;
> @@ -118,9 +122,11 @@ struct tps6598x {
> enum power_supply_usb_type usb_type;
>
> int wakeup;
> + u32 status; /* status reg */
> u16 pwr_status;
> struct delayed_work wq_poll;
> - irq_handler_t irq_handler;
> +
> + struct tipd_data cb;
> };
>
> static enum power_supply_property tps6598x_psy_props[] = {
> @@ -545,6 +551,64 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)
> return IRQ_NONE;
> }
>
> +static bool tps6598x_has_role_changed(struct tps6598x *tps, u32 status)
> +{
> + status ^= tps->status;
> +
> + return status & (TPS_STATUS_PORTROLE | TPS_STATUS_DATAROLE);
> +}
> +
> +static irqreturn_t tps25750_interrupt(int irq, void *data)
> +{
> + struct tps6598x *tps = data;
> + u64 event[2] = { };
> + u32 status;
> + int ret;
> +
> + mutex_lock(&tps->lock);
> +
> + ret = tps6598x_block_read(tps, TPS_REG_INT_EVENT1, event, 11);
> + if (ret) {
> + dev_err(tps->dev, "%s: failed to read events\n", __func__);
> + goto err_unlock;
> + }
> +
> + if (!(event[0] | event[1]))
> + goto err_unlock;
> +
> + if (!tps6598x_read_status(tps, &status))
> + goto err_clear_ints;
> +
> + if ((event[0] | event[1]) & TPS_REG_INT_POWER_STATUS_UPDATE)
> + if (!tps6598x_read_power_status(tps))
> + goto err_clear_ints;
> +
> + if ((event[0] | event[1]) & TPS_REG_INT_DATA_STATUS_UPDATE)
> + if (!tps6598x_read_data_status(tps))
> + goto err_clear_ints;
> +
> + /*
> + * data/port roles could be updated independently after
> + * a plug event. Therefore, we need to check
> + * for pr/dr status change to set TypeC dr/pr accordingly.
> + */
> + if ((event[0] | event[1]) & TPS_REG_INT_PLUG_EVENT ||
> + tps6598x_has_role_changed(tps, status))
> + tps6598x_handle_plug_event(tps, status);
> +
> + tps->status = status;
> +
> +err_clear_ints:
> + tps6598x_block_write(tps, TPS_REG_INT_CLEAR1, event, 11);
> +
> +err_unlock:
> + mutex_unlock(&tps->lock);
> +
> + if (event[0] | event[1])
> + return IRQ_HANDLED;
> + return IRQ_NONE;
> +}
> +
> static irqreturn_t tps6598x_interrupt(int irq, void *data)
> {
> struct tps6598x *tps = data;
> @@ -600,7 +664,7 @@ static void tps6598x_poll_work(struct work_struct *work)
> struct tps6598x *tps = container_of(to_delayed_work(work),
> struct tps6598x, wq_poll);
>
> - tps->irq_handler(0, tps);
> + tps->cb.irq_handler(0, tps);
> queue_delayed_work(system_power_efficient_wq,
> &tps->wq_poll, msecs_to_jiffies(POLL_INTERVAL));
> }
> @@ -967,9 +1031,20 @@ static int tps25750_apply_patch(struct tps6598x *tps)
> return 0;
> };
>
> +static const struct tipd_data cd321x_data = {
> + .irq_handler = cd321x_interrupt,
> +};
> +
> +static const struct tipd_data tps6598x_data = {
> + .irq_handler = tps6598x_interrupt,
> +};
> +
> +static const struct tipd_data tps25750_data = {
> + .irq_handler = tps25750_interrupt,
> +};
> +
> static int tps6598x_probe(struct i2c_client *client)
> {
> - irq_handler_t irq_handler = tps6598x_interrupt;
> struct device_node *np = client->dev.of_node;
> struct typec_capability typec_cap = { };
> struct tps6598x *tps;
> @@ -1017,15 +1092,18 @@ static int tps6598x_probe(struct i2c_client *client)
> APPLE_CD_REG_INT_DATA_STATUS_UPDATE |
> APPLE_CD_REG_INT_PLUG_EVENT;
>
> - irq_handler = cd321x_interrupt;
> + tps->cb = cd321x_data;
> } else {
> + if (is_tps25750)
> + tps->cb = tps25750_data;
> + else
> + tps->cb = tps6598x_data;
No. You assing those to the "data" member of your of_device_id:
static const struct of_device_id tps6598x_of_match[] = {
{ .compatible = "apple,cd321x", .data = &cd321_data },
{ .compatible = "ti,tps25750", .data = &tps25750_data },
{ .compatible = "ti,tps6598x", .data = &tps6598x_data },
{ }
};
thanks,
--
heikki
