From: Sven Peter <sven@svenpeter.dev>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: "Sven Peter" <sven@svenpeter.dev>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Guido Günther" <agx@sigxcpu.org>,
"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
"Hector Martin" <marcan@marcan.st>,
"Mohamed Mediouni" <mohamed.mediouni@caramail.com>,
"Stan Skowronek" <stan@corellium.com>,
"Mark Kettenis" <mark.kettenis@xs4all.nl>,
"Alexander Graf" <graf@amazon.com>,
"Alyssa Rosenzweig" <alyssa@rosenzweig.io>
Subject: [RFT PATCH 5/9] usb: typec: tipd: Allow to configure irq bits
Date: Sat, 18 Sep 2021 14:09:30 +0200 [thread overview]
Message-ID: <20210918120934.28252-6-sven@svenpeter.dev> (raw)
In-Reply-To: <20210918120934.28252-1-sven@svenpeter.dev>
The Apple variant of the TI TPS6598x chip uses different interrupt
numbers. Prepare for that by allowing those to be configured depending
on the compatible.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/usb/typec/tipd/core.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 4a6d66250fef..d191e7435018 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -80,6 +80,10 @@ static const char *const modes[] = {
struct tps6598x_hw {
bool use_int1;
bool use_int2;
+ unsigned int irq_power_status_update;
+ unsigned int irq_data_status_update;
+ unsigned int irq_plug_event;
+ void (*irq_trace)(u64 event1, u64 event2);
};
static const struct tps6598x_hw ti_tps6598x_data;
@@ -431,7 +435,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
dev_err(tps->dev, "%s: failed to read events\n", __func__);
goto err_unlock;
}
- trace_tps6598x_irq(event1, event2);
+ tps->hw->irq_trace(event1, event2);
event = event1 | event2;
if (!event)
@@ -444,7 +448,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
}
trace_tps6598x_status(status);
- if (event & TPS_REG_INT_POWER_STATUS_UPDATE) {
+ if (event & tps->hw->irq_power_status_update) {
ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &pwr_status);
if (ret < 0) {
dev_err(tps->dev, "failed to read power status: %d\n", ret);
@@ -453,7 +457,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
trace_tps6598x_power_status(pwr_status);
}
- if (event & TPS_REG_INT_DATA_STATUS_UPDATE) {
+ if (event & tps->hw->irq_data_status_update) {
ret = tps6598x_read32(tps, TPS_REG_DATA_STATUS, &data_status);
if (ret < 0) {
dev_err(tps->dev, "failed to read data status: %d\n", ret);
@@ -463,7 +467,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
}
/* Handle plug insert or removal */
- if (event & TPS_REG_INT_PLUG_EVENT) {
+ if (event & tps->hw->irq_plug_event) {
if (status & TPS_STATUS_PLUG_PRESENT) {
ret = tps6598x_connect(tps, status);
if (ret)
@@ -760,6 +764,10 @@ static int tps6598x_remove(struct i2c_client *client)
static const struct tps6598x_hw ti_tps6598x_data = {
.use_int1 = true,
.use_int2 = true,
+ .irq_power_status_update = TPS_REG_INT_POWER_STATUS_UPDATE,
+ .irq_data_status_update = TPS_REG_INT_DATA_STATUS_UPDATE,
+ .irq_plug_event = TPS_REG_INT_PLUG_EVENT,
+ .irq_trace = trace_tps6598x_irq,
};
static const struct of_device_id tps6598x_of_match[] = {
--
2.25.1
next prev parent reply other threads:[~2021-09-18 12:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 12:09 [RFT PATCH 0/9] usb: typec: tipd: Add Apple M1 support Sven Peter
2021-09-18 12:09 ` [RFT PATCH 1/9] dt-bindings: usb: tps6598x: Add Apple CD321x compatible Sven Peter
2021-09-19 11:25 ` Alyssa Rosenzweig
2021-09-22 20:38 ` Rob Herring
2021-09-18 12:09 ` [RFT PATCH 2/9] usb: typec: tipd: Prepare supporting different variants Sven Peter
2021-09-19 11:27 ` Alyssa Rosenzweig
2021-09-21 13:10 ` Heikki Krogerus
2021-09-22 14:55 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 3/9] usb: typec: tipd: Allow irq controller selection Sven Peter
2021-09-19 11:28 ` Alyssa Rosenzweig
2021-09-21 13:21 ` Heikki Krogerus
2021-09-22 14:56 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 4/9] usb: typec: tipd: Add short-circuit for no irqs Sven Peter
2021-09-21 13:23 ` Heikki Krogerus
2021-09-18 12:09 ` Sven Peter [this message]
2021-09-21 13:34 ` [RFT PATCH 5/9] usb: typec: tipd: Allow to configure irq bits Heikki Krogerus
2021-09-22 14:58 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 6/9] usb: typec: tipd: Setup IntMask explicitly Sven Peter
2021-09-19 11:31 ` Alyssa Rosenzweig
2021-09-21 13:40 ` Heikki Krogerus
2021-09-22 14:58 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 7/9] usb: typec: tipd: Add support for apple,cd321x Sven Peter
2021-09-19 11:32 ` Alyssa Rosenzweig
2021-09-18 12:09 ` [RFT PATCH 8/9] usb: typec: tipd: Switch power state to S0 for Apple variant Sven Peter
2021-09-19 11:33 ` Alyssa Rosenzweig
2021-09-21 13:46 ` Heikki Krogerus
2021-09-22 15:00 ` Sven Peter
2021-09-18 12:09 ` [RFT PATCH 9/9] usb: typec: tipd: Remove FIXME about testing with I2C_FUNC_I2C Sven Peter
2021-09-19 11:33 ` Alyssa Rosenzweig
2021-09-21 13:41 ` Heikki Krogerus
2021-09-19 11:35 ` [RFT PATCH 0/9] usb: typec: tipd: Add Apple M1 support Alyssa Rosenzweig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210918120934.28252-6-sven@svenpeter.dev \
--to=sven@svenpeter.dev \
--cc=agx@sigxcpu.org \
--cc=alyssa@rosenzweig.io \
--cc=bryan.odonoghue@linaro.org \
--cc=graf@amazon.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=mark.kettenis@xs4all.nl \
--cc=mohamed.mediouni@caramail.com \
--cc=stan@corellium.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).