From: Sven Peter <sven@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Janne Grunau <j@jannau.net>, Neal Gompa <neal@gompa.dev>,
Andreas Noever <andreas.noever@gmail.com>,
Mika Westerberg <westeri@kernel.org>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: Konrad Dybcio <konradybcio@kernel.org>,
linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, asahi@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
Sven Peter <sven@kernel.org>
Subject: [PATCH 03/19] usb: typec: tipd: Hook up Thunderbolt switch for CD321x
Date: Sun, 30 Aug 2026 22:19:21 +0200 [thread overview]
Message-ID: <20260830-b4-apple-soc-tbt-v1-3-44bc9348683c@kernel.org> (raw)
In-Reply-To: <20260830-b4-apple-soc-tbt-v1-0-44bc9348683c@kernel.org>
Look up the Thunderbolt switch for CD321x ports and forward cable details
whenever a Thunderbolt or USB4 connection comes up or goes away.
Signed-off-by: Sven Peter <sven@kernel.org>
---
drivers/usb/typec/tipd/core.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 522f56742aa9..5016f9dba956 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -216,6 +216,8 @@ struct cd321x {
struct typec_mux *mux;
struct typec_mux_state state;
+ struct typec_thunderbolt_switch *tbt_switch;
+
struct cd321x_status update_status;
struct delayed_work update_work;
struct usb_pd_identity cur_partner_identity;
@@ -677,6 +679,9 @@ static void tps6598x_handle_plug_event(struct tps6598x *tps, u32 status)
static void cd321x_typec_update_mode(struct tps6598x *tps, struct cd321x_status *st)
{
struct cd321x *cd321x = container_of(tps, struct cd321x, tps);
+ struct typec_thunderbolt_switch_data tbt_switch_data = {
+ .state = TYPEC_THUNDERBOLT_SWITCH_OFF,
+ };
if (!(st->data_status & TPS_DATA_STATUS_DATA_CONNECTION)) {
if (cd321x->state.mode == TYPEC_STATE_SAFE)
@@ -684,6 +689,7 @@ static void cd321x_typec_update_mode(struct tps6598x *tps, struct cd321x_status
cd321x->state.alt = NULL;
cd321x->state.mode = TYPEC_STATE_SAFE;
cd321x->state.data = NULL;
+ typec_thunderbolt_switch_set(cd321x->tbt_switch, &tbt_switch_data);
typec_mux_set(cd321x->mux, &cd321x->state);
} else if (st->data_status & TPS_DATA_STATUS_DP_CONNECTION) {
struct typec_displayport_data dp_data;
@@ -723,6 +729,7 @@ static void cd321x_typec_update_mode(struct tps6598x *tps, struct cd321x_status
cd321x->state.alt = cd321x->port_altmode_dp;
cd321x->state.data = &dp_data;
cd321x->state.mode = mode;
+ typec_thunderbolt_switch_set(cd321x->tbt_switch, &tbt_switch_data);
typec_mux_set(cd321x->mux, &cd321x->state);
} else if (st->data_status & TPS_DATA_STATUS_TBT_CONNECTION) {
struct typec_thunderbolt_data tbt_data;
@@ -738,6 +745,13 @@ static void cd321x_typec_update_mode(struct tps6598x *tps, struct cd321x_status
cd321x->state.mode = TYPEC_TBT_MODE;
cd321x->state.data = &tbt_data;
typec_mux_set(cd321x->mux, &cd321x->state);
+
+ tbt_switch_data.state = TYPEC_THUNDERBOLT_SWITCH_TBT;
+ tbt_switch_data.tbt = tbt_data;
+ tbt_switch_data.orientation = TPS_STATUS_TO_UPSIDE_DOWN(st->status) ?
+ TYPEC_ORIENTATION_REVERSE :
+ TYPEC_ORIENTATION_NORMAL;
+ typec_thunderbolt_switch_set(cd321x->tbt_switch, &tbt_switch_data);
} else if (st->data_status & CD321X_DATA_STATUS_USB4_CONNECTION) {
struct enter_usb_data eusb_data;
@@ -752,12 +766,20 @@ static void cd321x_typec_update_mode(struct tps6598x *tps, struct cd321x_status
cd321x->state.data = &eusb_data;
cd321x->state.mode = TYPEC_MODE_USB4;
typec_mux_set(cd321x->mux, &cd321x->state);
+
+ tbt_switch_data.state = TYPEC_THUNDERBOLT_SWITCH_USB4;
+ tbt_switch_data.usb4 = eusb_data;
+ tbt_switch_data.orientation = TPS_STATUS_TO_UPSIDE_DOWN(st->status) ?
+ TYPEC_ORIENTATION_REVERSE :
+ TYPEC_ORIENTATION_NORMAL;
+ typec_thunderbolt_switch_set(cd321x->tbt_switch, &tbt_switch_data);
} else {
if (cd321x->state.alt == NULL && cd321x->state.mode == TYPEC_STATE_USB)
return;
cd321x->state.alt = NULL;
cd321x->state.mode = TYPEC_STATE_USB;
cd321x->state.data = NULL;
+ typec_thunderbolt_switch_set(cd321x->tbt_switch, &tbt_switch_data);
typec_mux_set(cd321x->mux, &cd321x->state);
}
@@ -771,6 +793,9 @@ static void cd321x_update_work(struct work_struct *work)
struct cd321x, update_work);
struct tps6598x *tps = &cd321x->tps;
struct cd321x_status st;
+ struct typec_thunderbolt_switch_data tbt_switch_data = {
+ .state = TYPEC_THUNDERBOLT_SWITCH_OFF,
+ };
guard(mutex)(&tps->lock);
@@ -821,6 +846,7 @@ static void cd321x_update_work(struct work_struct *work)
/* If there was a disconnection, set PHY to off */
if (!new_connected || was_disconnected) {
+ typec_thunderbolt_switch_set(cd321x->tbt_switch, &tbt_switch_data);
cd321x->state.alt = NULL;
cd321x->state.mode = TYPEC_STATE_SAFE;
cd321x->state.data = NULL;
@@ -1328,6 +1354,12 @@ cd321x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
goto err_unregister_altmodes;
}
+ cd321x->tbt_switch = fwnode_typec_thunderbolt_switch_get(fwnode);
+ if (IS_ERR(cd321x->tbt_switch)) {
+ ret = PTR_ERR(cd321x->tbt_switch);
+ goto err_unregister_mux;
+ }
+
cd321x->state.alt = NULL;
cd321x->state.mode = TYPEC_STATE_SAFE;
cd321x->state.data = NULL;
@@ -1335,6 +1367,9 @@ cd321x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
return 0;
+err_unregister_mux:
+ typec_mux_put(cd321x->mux);
+ cd321x->mux = NULL;
err_unregister_altmodes:
typec_unregister_altmode(cd321x->port_altmode_dp);
typec_unregister_altmode(cd321x->port_altmode_tbt);
@@ -1356,6 +1391,8 @@ cd321x_unregister_port(struct tps6598x *tps)
{
struct cd321x *cd321x = container_of(tps, struct cd321x, tps);
+ typec_thunderbolt_switch_put(cd321x->tbt_switch);
+ cd321x->tbt_switch = NULL;
typec_mux_put(cd321x->mux);
cd321x->mux = NULL;
typec_unregister_altmode(cd321x->port_altmode_dp);
--
2.55.0
next prev parent reply other threads:[~2026-08-30 20:19 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-30 20:19 [PATCH 00/19] Initial USB4/Thunderbolt support for Apple M1/M2/M3 SoCs Sven Peter
2026-08-30 20:19 ` [PATCH 01/19] dt-bindings: usb: Add thunderbolt-switch property Sven Peter
2026-08-30 20:19 ` [PATCH 02/19] usb: typec: Add thunderbolt switch Sven Peter
2026-09-01 11:17 ` Heikki Krogerus
2026-09-01 18:53 ` Sven Peter
2026-08-30 20:19 ` Sven Peter [this message]
2026-08-30 20:19 ` [PATCH 04/19] dt-bindings: thunderbolt: Add Apple USB4/Thunderbolt NHI Sven Peter
2026-08-30 20:19 ` [PATCH 05/19] dt-bindings: thunderbolt: Add Apple USB4/Thunderbolt ACIO block Sven Peter
2026-08-30 20:19 ` [PATCH 06/19] thunderbolt: Try reading host DROM from device tree first Sven Peter
2026-09-01 8:48 ` Mika Westerberg
2026-08-30 20:19 ` [PATCH 07/19] thunderbolt: Don't read the UID if we already know it Sven Peter
2026-08-30 20:19 ` [PATCH 08/19] thunderbolt: Allocate ring HopID before requesting the ring interrupt Sven Peter
2026-08-30 20:19 ` [PATCH 09/19] thunderbolt: Add ring_interrupt_active to tb_nhi_ops Sven Peter
2026-08-30 20:19 ` [PATCH 10/19] thunderbolt: Make the ring register layout configurable Sven Peter
2026-09-01 8:58 ` Mika Westerberg
2026-09-01 18:56 ` Sven Peter
2026-08-30 20:19 ` [PATCH 11/19] thunderbolt: Add ring_interrupt_mask to tb_nhi_ops Sven Peter
2026-08-30 20:19 ` [PATCH 12/19] thunderbolt: Add ring_configure " Sven Peter
2026-08-30 20:19 ` [PATCH 13/19] thunderbolt: Add QUIRK_NO_DMA_PORT Sven Peter
2026-09-01 9:04 ` Mika Westerberg
2026-09-01 17:06 ` Sven Peter
2026-08-30 20:19 ` [PATCH 14/19] thunderbolt: Add QUIRK_NO_USB3_BW_ALLOC Sven Peter
2026-09-01 9:12 ` Mika Westerberg
2026-08-30 20:19 ` [PATCH 15/19] thunderbolt: Export symbols required by the Apple Silicon driver Sven Peter
2026-08-30 20:19 ` [PATCH 16/19] thunderbolt: Add Apple Silicon support Sven Peter
2026-09-01 10:09 ` Mika Westerberg
2026-09-01 19:06 ` Sven Peter
2026-08-30 20:19 ` [PATCH 17/19] arm64: dts: apple: t8103: Add USB4 ACIO and NHI Sven Peter
2026-09-01 10:20 ` Mika Westerberg
2026-08-30 20:19 ` [PATCH 18/19] arm64: dts: apple: t8112: " Sven Peter
2026-08-30 20:19 ` [PATCH 19/19] arm64: dts: apple: t60xx: " Sven Peter
2026-08-31 17:44 ` [PATCH 00/19] Initial USB4/Thunderbolt support for Apple M1/M2/M3 SoCs Joshua Peisach
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=20260830-b4-apple-soc-tbt-v1-3-44bc9348683c@kernel.org \
--to=sven@kernel.org \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=asahi@lists.linux.dev \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=j@jannau.net \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neal@gompa.dev \
--cc=p.zabel@pengutronix.de \
--cc=robh@kernel.org \
--cc=westeri@kernel.org \
/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