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 7/9] usb: typec: tipd: Add support for apple,cd321x
Date: Sat, 18 Sep 2021 14:09:32 +0200 [thread overview]
Message-ID: <20210918120934.28252-8-sven@svenpeter.dev> (raw)
In-Reply-To: <20210918120934.28252-1-sven@svenpeter.dev>
After all the preparations in the previous commits we can now finally
add support for the Apple CD321x chip which is a variant of the TI TPS
6598x chip. The major differences are the changed interrupt numbers and
the concurrent connection to the SMC which we must not disturb.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/usb/typec/tipd/core.c | 10 ++++++++++
drivers/usb/typec/tipd/tps6598x.h | 6 ++++++
drivers/usb/typec/tipd/trace.h | 27 +++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 2058e8cca631..e96b17fe6af6 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -788,8 +788,18 @@ static const struct tps6598x_hw ti_tps6598x_data = {
.irq_trace = trace_tps6598x_irq,
};
+static const struct tps6598x_hw apple_cd321x_data = {
+ .use_int1 = true,
+ .use_int2 = false,
+ .irq_power_status_update = APPLE_TPS_REG_INT_POWER_STATUS_UPDATE,
+ .irq_data_status_update = APPLE_TPS_REG_INT_DATA_STATUS_UPDATE,
+ .irq_plug_event = APPLE_TPS_REG_INT_PLUG_EVENT,
+ .irq_trace = trace_cd321x_irq,
+};
+
static const struct of_device_id tps6598x_of_match[] = {
{ .compatible = "ti,tps6598x", .data = &ti_tps6598x_data },
+ { .compatible = "apple,cd321x", .data = &apple_cd321x_data },
{}
};
MODULE_DEVICE_TABLE(of, tps6598x_of_match);
diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h
index 003a577be216..36b482733297 100644
--- a/drivers/usb/typec/tipd/tps6598x.h
+++ b/drivers/usb/typec/tipd/tps6598x.h
@@ -129,6 +129,12 @@
#define TPS_REG_INT_HARD_RESET BIT(1)
#define TPS_REG_INT_PD_SOFT_RESET BIT(0)
+/* Apple-specific TPS_REG_INT_* bits */
+#define APPLE_TPS_REG_INT_DATA_STATUS_UPDATE BIT(10)
+#define APPLE_TPS_REG_INT_POWER_STATUS_UPDATE BIT(9)
+#define APPLE_TPS_REG_INT_STATUS_UPDATE BIT(8)
+#define APPLE_TPS_REG_INT_PLUG_EVENT BIT(1)
+
/* TPS_REG_POWER_STATUS bits */
#define TPS_POWER_STATUS_CONNECTION(x) TPS_FIELD_GET(BIT(0), (x))
#define TPS_POWER_STATUS_SOURCESINK(x) TPS_FIELD_GET(BIT(1), (x))
diff --git a/drivers/usb/typec/tipd/trace.h b/drivers/usb/typec/tipd/trace.h
index 5d09d6f78930..090633a1ae1d 100644
--- a/drivers/usb/typec/tipd/trace.h
+++ b/drivers/usb/typec/tipd/trace.h
@@ -67,6 +67,13 @@
{ TPS_REG_INT_USER_VID_ALT_MODE_ATTN_VDM, "USER_VID_ALT_MODE_ATTN_VDM" }, \
{ TPS_REG_INT_USER_VID_ALT_MODE_OTHER_VDM, "USER_VID_ALT_MODE_OTHER_VDM" })
+#define show_cd321x_irq_flags(flags) \
+ __print_flags_u64(flags, "|", \
+ { APPLE_TPS_REG_INT_PLUG_EVENT, "PLUG_EVENT" }, \
+ { APPLE_TPS_REG_INT_POWER_STATUS_UPDATE, "POWER_STATUS_UPDATE" }, \
+ { APPLE_TPS_REG_INT_STATUS_UPDATE, "DATA_STATUS_UPDATE" }, \
+ { APPLE_TPS_REG_INT_PLUG_EVENT, "STATUS_UPDATE" })
+
#define TPS6598X_STATUS_FLAGS_MASK (GENMASK(31, 0) ^ (TPS_STATUS_CONN_STATE_MASK | \
TPS_STATUS_PP_5V0_SWITCH_MASK | \
TPS_STATUS_PP_HV_SWITCH_MASK | \
@@ -207,6 +214,26 @@ TRACE_EVENT(tps6598x_irq,
show_irq_flags(__entry->event2))
);
+TRACE_EVENT(cd321x_irq,
+ TP_PROTO(u64 event1,
+ u64 event2),
+ TP_ARGS(event1, event2),
+
+ TP_STRUCT__entry(
+ __field(u64, event1)
+ __field(u64, event2)
+ ),
+
+ TP_fast_assign(
+ __entry->event1 = event1;
+ __entry->event2 = event2;
+ ),
+
+ TP_printk("event1=%s, event2=%s",
+ show_cd321x_irq_flags(__entry->event1),
+ show_cd321x_irq_flags(__entry->event2))
+);
+
TRACE_EVENT(tps6598x_status,
TP_PROTO(u32 status),
TP_ARGS(status),
--
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 ` [RFT PATCH 5/9] usb: typec: tipd: Allow to configure irq bits Sven Peter
2021-09-21 13:34 ` 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 ` Sven Peter [this message]
2021-09-19 11:32 ` [RFT PATCH 7/9] usb: typec: tipd: Add support for apple,cd321x 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-8-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).