From nobody Sat Feb 7 09:29:50 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70F142D46B1; Thu, 21 Aug 2025 15:40:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755790804; cv=none; b=DYoREhjcnmdaTymtP7Sc25/Knw7nXeqcOVjzBDik6J5FWElXLCBVkIqAvfNujs9KF/p3xWG4dCb2WMY0VxyI/uELI9HRAApStUuTs+HILx0dc1OlrYvg51j+ZT665RZ8mWrgNcYsTeAIF2iwH4fj+CNS5wjfloACr7cbm4TD70o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755790804; c=relaxed/simple; bh=7y9x8hEHEH19KOEuvgwq8U5ghcJb+lno5nXbqmMoyEw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mz7dD2jdf/dyN2rHOuPjCNe4E580IjEHJ1mbI5V/ZSEyreDu5AW9Fg71CUOUb6u2taCa1wFfiYtmmvBye0XRVXuygKq8ohNN/OiFFiwRGI22+4/P+XUPFp2e89JzGEnGXh1AU/qImxKLzrrq6zuC8b1+ElFfYdBZCTv1DVU8fRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tJYM5tL6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tJYM5tL6" Received: by smtp.kernel.org (Postfix) with ESMTPS id D9345C4AF54; Thu, 21 Aug 2025 15:40:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755790804; bh=7y9x8hEHEH19KOEuvgwq8U5ghcJb+lno5nXbqmMoyEw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tJYM5tL6aDeObfODcSihpOEuKmjZBGE8LK7q2hdcQgBLFUwKhGur7ASJ3bDwoGsRp IpxfmjIyGtbmvYO48eiyOYdVAnNi1Nw+6TmCj57b4PHHvDP4JPDjpISBQdlZn4ggZF zmdRI/Cq6yko95qYOJsPrpj9Mn0AsPeGiLY9k/xgqfJh3IqKP0nq+FYUPwpWqYCTep GCTKM7cF96MCPCYh4X/W3e0QYuOOvWF78hUtRsNuXTgbDeLq2+F/R/RHzj2jFvj7HJ rXPlA5rHKp71B6roOnokI5Ftp9uPWn3hAr3yxc96DHBW4C9rb95X99Z01ZhZa/XXEE 4FhRW8d+eOquw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD364CA0FE1; Thu, 21 Aug 2025 15:40:03 +0000 (UTC) From: Sven Peter Date: Thu, 21 Aug 2025 15:39:06 +0000 Subject: [PATCH RFC 14/22] usb: typec: tipd: Register DisplayPort and Thunderbolt altmodes for cd321x Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250821-atcphy-6-17-v1-14-172beda182b8@kernel.org> References: <20250821-atcphy-6-17-v1-0-172beda182b8@kernel.org> In-Reply-To: <20250821-atcphy-6-17-v1-0-172beda182b8@kernel.org> To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Felipe Balbi , Janne Grunau , Alyssa Rosenzweig , Neal Gompa , Vinod Koul , Kishon Vijay Abraham I , Thinh Nguyen , Heikki Krogerus , Philipp Zabel Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, Sven Peter X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5612; i=sven@kernel.org; h=from:subject:message-id; bh=7y9x8hEHEH19KOEuvgwq8U5ghcJb+lno5nXbqmMoyEw=; b=owGbwMvMwCHmIlirolUq95LxtFoSQ8Zy280yG+TuV3wOdP+vnLqb+fuppvYiRya3CcJaFvc4w +a/L7vdUcrCIMbBICumyLJ9v73pk4dvBJduuvQeZg4rE8gQBi5OAZjI7YmMDB3ua6oZjwqx+Vz4 9tU5cLtjyeNv66cmFQYXvUwznf7tZSTDP2NXM6XHzxt7bmw8kfFUt9GV17xl2s7Dq7VbdC1ULBu KOQE= X-Developer-Key: i=sven@kernel.org; a=openpgp; fpr=A1E3E34A2B3C820DBC4955E5993B08092F131F93 X-Endpoint-Received: by B4 Relay for sven@kernel.org/default with auth_id=407 Ports equipped with a CD321x are only found on Apple Silicon machines and always support DisplayPort, Thunderbolt and USB4. Register these port modes unconditionally. Signed-off-by: Sven Peter --- drivers/usb/typec/tipd/core.c | 87 +++++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 59d270eb50ea3dc49ad32ff71f8354e23c1083c9..e369897bfa017ca96e559a8bd70= da11207d4513a 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include #include @@ -145,6 +147,7 @@ struct tipd_data { u64 irq_mask1; size_t tps_struct_size; int (*register_port)(struct tps6598x *tps, struct fwnode_handle *node); + void (*unregister_port)(struct tps6598x *tps); void (*trace_data_status)(u32 status); void (*trace_power_status)(u16 status); void (*trace_status)(u32 status); @@ -186,6 +189,9 @@ struct cd321x { struct tps6598x_dp_sid_status_reg dp_sid_status; struct tps6598x_intel_vid_status_reg intel_vid_status; struct tps6598x_usb4_status_reg usb4_status; + + struct typec_altmode *port_altmode_dp; + struct typec_altmode *port_altmode_tbt; }; =20 static enum power_supply_property tps6598x_psy_props[] =3D { @@ -965,6 +971,78 @@ tps6598x_register_port(struct tps6598x *tps, struct fw= node_handle *fwnode) return 0; } =20 +static int cd321x_register_port_altmodes(struct cd321x *cd321x) +{ + struct typec_altmode_desc desc; + struct typec_altmode *amode; + + memset(&desc, 0, sizeof(desc)); + desc.svid =3D USB_TYPEC_DP_SID; + desc.mode =3D USB_TYPEC_DP_MODE; + desc.vdo =3D DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | BIT(DP_PIN_ASS= IGN_D)); + desc.vdo |=3D DP_CAP_DFP_D; + amode =3D typec_port_register_altmode(cd321x->tps.port, &desc); + if (IS_ERR(amode)) + return PTR_ERR(amode); + cd321x->port_altmode_dp =3D amode; + + memset(&desc, 0, sizeof(desc)); + desc.svid =3D USB_TYPEC_TBT_SID; + desc.mode =3D TYPEC_ANY_MODE; + amode =3D typec_port_register_altmode(cd321x->tps.port, &desc); + if (IS_ERR(amode)) { + typec_unregister_altmode(cd321x->port_altmode_dp); + cd321x->port_altmode_dp =3D NULL; + return PTR_ERR(amode); + } + cd321x->port_altmode_tbt =3D amode; + + return 0; +} + +static int +cd321x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode) +{ + struct cd321x *cd321x =3D container_of(tps, struct cd321x, tps); + int ret; + + ret =3D tps6598x_register_port(tps, fwnode); + if (ret) + return ret; + + ret =3D cd321x_register_port_altmodes(cd321x); + if (ret) + goto err_unregister_port; + + typec_set_mode(tps->port, TYPEC_STATE_SAFE); + + return 0; + +err_unregister_port: + typec_unregister_port(tps->port); + return ret; +} + +static void +tps6598x_unregister_port(struct tps6598x *tps) +{ + typec_unregister_port(tps->port); +} + +static void +cd321x_unregister_port(struct tps6598x *tps) +{ + struct cd321x *cd321x =3D container_of(tps, struct cd321x, tps); + + if (cd321x->port_altmode_dp) + typec_unregister_altmode(cd321x->port_altmode_dp); + if (cd321x->port_altmode_tbt) + typec_unregister_altmode(cd321x->port_altmode_tbt); + cd321x->port_altmode_dp =3D NULL; + cd321x->port_altmode_tbt =3D NULL; + typec_unregister_port(tps->port); +} + static int tps_request_firmware(struct tps6598x *tps, const struct firmwar= e **fw, const char **firmware_name) { @@ -1506,7 +1584,7 @@ static int tps6598x_probe(struct i2c_client *client) err_disconnect: tps6598x_disconnect(tps, 0); err_unregister_port: - typec_unregister_port(tps->port); + tps->data->unregister_port(tps); err_role_put: usb_role_switch_put(tps->role_sw); err_fwnode_put: @@ -1530,7 +1608,7 @@ static void tps6598x_remove(struct i2c_client *client) devm_free_irq(tps->dev, client->irq, tps); =20 tps6598x_disconnect(tps, 0); - typec_unregister_port(tps->port); + tps->data->unregister_port(tps); usb_role_switch_put(tps->role_sw); =20 /* Reset PD controller to remove any applied patch */ @@ -1599,7 +1677,8 @@ static const struct tipd_data cd321x_data =3D { APPLE_CD_REG_INT_DATA_STATUS_UPDATE | APPLE_CD_REG_INT_PLUG_EVENT, .tps_struct_size =3D sizeof(struct cd321x), - .register_port =3D tps6598x_register_port, + .register_port =3D cd321x_register_port, + .unregister_port =3D cd321x_unregister_port, .trace_data_status =3D trace_cd321x_data_status, .trace_power_status =3D trace_tps6598x_power_status, .trace_status =3D trace_tps6598x_status, @@ -1616,6 +1695,7 @@ static const struct tipd_data tps6598x_data =3D { TPS_REG_INT_PLUG_EVENT, .tps_struct_size =3D sizeof(struct tps6598x), .register_port =3D tps6598x_register_port, + .unregister_port =3D tps6598x_unregister_port, .trace_data_status =3D trace_tps6598x_data_status, .trace_power_status =3D trace_tps6598x_power_status, .trace_status =3D trace_tps6598x_status, @@ -1632,6 +1712,7 @@ static const struct tipd_data tps25750_data =3D { TPS_REG_INT_PLUG_EVENT, .tps_struct_size =3D sizeof(struct tps6598x), .register_port =3D tps25750_register_port, + .unregister_port =3D tps6598x_unregister_port, .trace_data_status =3D trace_tps6598x_data_status, .trace_power_status =3D trace_tps25750_power_status, .trace_status =3D trace_tps25750_status, --=20 2.34.1