From mboxrd@z Thu Jan 1 00:00:00 1970 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 B2FB13D3305; Sun, 6 Sep 2026 18:37:08 +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=1788719828; cv=none; b=grKVARM/NlBuO/KeXwyZdz6YJB4puqJmPMlx5Jtvkkf4CZo3QdAAex7WHriJ2Q7GNQZuE3etcWp1SwfkeVLZidsHwz3R6k4Uks5txQCw8T8MrJuwT7wZtHyNZdDyjvazkc5Ht9itcEGl+MA/x5wAr82UM1ncdcTs43YXiY9aApc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788719828; c=relaxed/simple; bh=yCkOmBaR5nil6EWh+gg1vqFVc4hjJ7N+uufRHhr7jwc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rcDtgMzHC+pC+j8DYhu3nU0QOUUg0RR+RgpCfcapyC6WUnwFHu9C4In+YVzlzalS0k7H+qJAKmlqhLvEFGzg1iUcP555PA9txLvPGah2fSDxSL6kupvLxGFTUSfOWF+qB5On0qXtNf1wm3pYr2ybQcmoan+B4tWVh4elcLoUosI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XurR2UW/; 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="XurR2UW/" Received: by smtp.kernel.org (Postfix) with ESMTPS id 97D06C2BCFF; Sun, 6 Sep 2026 18:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788719828; bh=yCkOmBaR5nil6EWh+gg1vqFVc4hjJ7N+uufRHhr7jwc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XurR2UW/SAiJf7jSfEB1+y4Uwm7Pd9pIcVDA+YQqEsZJGwONaXo3bzY0P3i1v2pft RDmNvAsVOo9alwQ54l3XLDRhMPvOtOIldzq9BqNmpGyV47kZWMn8C+HqnU3gCGZpxo hDXpkdtq3fnxh1IGzB1uU1aOQvL9Nahh4VRTvos9HaPXj3bigFQmRSchXEUHtFy8P3 UBDAGl7iZQtuTsR71doP+fO8nceZn3GzczedCNrhT1117od4xSr2j5S9+733Fk9u0W 6a7+dIn1+drFSo7oIy1PVG9INRHETAEdtLu+P3sNIPISDHNv7X15T4VcYpujDn59HY wr07RwQLrBCwg== 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 86AE3C79FA3; Sun, 6 Sep 2026 18:37:08 +0000 (UTC) From: Sven Peter Date: Sun, 06 Sep 2026 20:36:44 +0200 Subject: [PATCH v2 21/22] arm64: dts: apple: t8112: Add USB4 ACIO and NHI Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260906-b4-apple-soc-tbt-v2-21-1f80085f93fb@kernel.org> References: <20260906-b4-apple-soc-tbt-v2-0-1f80085f93fb@kernel.org> In-Reply-To: <20260906-b4-apple-soc-tbt-v2-0-1f80085f93fb@kernel.org> To: Heikki Krogerus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Janne Grunau , Neal Gompa , Andreas Noever , Mika Westerberg , Yehezkel Bernat , Philipp Zabel Cc: Konrad Dybcio , 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 X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10505; i=sven@kernel.org; h=from:subject:message-id; bh=yCkOmBaR5nil6EWh+gg1vqFVc4hjJ7N+uufRHhr7jwc=; b=owGbwMvMwCXmIlirolUq95LxtFoSQ9bcTWe3bLoX8SFp0buN0X4LP5nz/D1bqfjsfMH+XLGbz yyazky62VHKwiDGxSArpsiyfb+96ZOHbwSXbrr0HmYOKxPIEAYuTgGYiOImRoaHvAncd4/Jylc7 6upKtG39u1z40oW+9TLHEqzO/34k872O4X+m2s6fe08dCsz9sGmrY3jhbbbeZdej4/++8ajNvh9 fcYsXAA== 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 Add the ACIO host router, NHI, DART and mailbox nodes for both Type-C ports on t8112 and connect the host routers to the Type-C connectors. Also describe the USB3 path from each host router to its DWC3 controller so the NHI driver can create the required device link. Signed-off-by: Sven Peter --- arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 95 ++++++++++++++- arch/arm64/boot/dts/apple/t8112.dtsi | 186 ++++++++++++++++++++++++++++++ 2 files changed, 279 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi index 562e7a25a1e8..d0dc7eaaca35 100644 --- a/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi +++ b/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi @@ -13,6 +13,10 @@ / { aliases { atcphy0 = &atcphy0; atcphy1 = &atcphy1; + usb4-0-acio = &usb4_0_acio; + usb4-0-nhi = &usb4_0_nhi; + usb4-1-acio = &usb4_1_acio; + usb4-1-nhi = &usb4_1_nhi; serial0 = &serial0; serial2 = &serial2; }; @@ -76,6 +80,13 @@ typec0_connector_ss: endpoint { remote-endpoint = <&atcphy0_typec_lanes>; }; }; + + port@2 { + reg = <2>; + typec0_con_tbt: endpoint { + remote-endpoint = <&usb4_0_acio_tbt>; + }; + }; }; }; }; @@ -107,6 +118,13 @@ typec1_connector_ss: endpoint { remote-endpoint = <&atcphy1_typec_lanes>; }; }; + + port@2 { + reg = <2>; + typec1_con_tbt: endpoint { + remote-endpoint = <&usb4_1_acio_tbt>; + }; + }; }; }; }; @@ -126,10 +144,19 @@ dwc3_0_hs: endpoint { }; port@1 { + #address-cells = <1>; + #size-cells = <0>; reg = <1>; - dwc3_0_ss: endpoint { + + dwc3_0_ss: endpoint@0 { + reg = <0>; remote-endpoint = <&atcphy0_usb3>; }; + + dwc3_0_usb4: endpoint@1 { + reg = <1>; + remote-endpoint = <&usb4_0_acio_usb3>; + }; }; }; }; @@ -147,10 +174,19 @@ dwc3_1_hs: endpoint { }; port@1 { + #address-cells = <1>; + #size-cells = <0>; reg = <1>; - dwc3_1_ss: endpoint { + + dwc3_1_ss: endpoint@0 { + reg = <0>; remote-endpoint = <&atcphy1_usb3>; }; + + dwc3_1_usb4: endpoint@1 { + reg = <1>; + remote-endpoint = <&usb4_1_acio_usb3>; + }; }; }; }; @@ -198,6 +234,61 @@ atcphy1_usb3: endpoint { }; }; +/* USB4 */ +&usb4_0_acio { + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* 1: USB4 port */ + port@1 { + reg = <1>; + usb4_0_acio_tbt: endpoint { + remote-endpoint = <&typec0_con_tbt>; + }; + }; + + /* 2: USB4 lane 1 adapter */ + /* 3: PCIe */ + port@4 { + reg = <4>; + usb4_0_acio_usb3: endpoint { + remote-endpoint = <&dwc3_0_usb4>; + }; + }; + + /* 5: DP0 */ + /* 6: DP1 */ + }; +}; + +&usb4_1_acio { + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* 1: USB4 port */ + port@1 { + reg = <1>; + usb4_1_acio_tbt: endpoint { + remote-endpoint = <&typec1_con_tbt>; + }; + }; + + /* 2: USB4 lane 1 adapter */ + /* 3: PCIe */ + port@4 { + reg = <4>; + usb4_1_acio_usb3: endpoint { + remote-endpoint = <&dwc3_1_usb4>; + }; + }; + + /* 5: DP0 */ + /* 6: DP1 */ + }; +}; + &i2c1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi index 2c3b59e05e01..e70ed4a470e1 100644 --- a/arch/arm64/boot/dts/apple/t8112.dtsi +++ b/arch/arm64/boot/dts/apple/t8112.dtsi @@ -991,6 +991,14 @@ pinctrl_aop: pinctrl@24a820000 { , , ; + + acio0_pins: acio0-pins { + pinmux = ; + }; + + acio1_pins: acio1-pins { + pinmux = ; + }; }; ans_mbox: mbox@277408000 { @@ -1027,6 +1035,95 @@ nvme@27bcc0000 { resets = <&ps_ans>; }; + usb4_0_mbox: mailbox@381108000 { + compatible = "apple,t8112-asc-mailbox", + "apple,asc-mailbox-v4"; + reg = <0x3 0x81108000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + }; + + usb4_0_acio: cio@381ac0000 { + compatible = "apple,t8112-usb4-acio", "apple,t8103-usb4-acio"; + reg = <0x3 0x81ac0000 0x0 0xc000>, + <0x3 0x81080000 0x0 0x20000>; + reg-names = "rc", "sram"; + + mboxes = <&usb4_0_mbox>; + resets = <&cio_reset 0>; + + power-domains = <&ps_atc0_cio>, + <&ps_atc0_cio_pcie>, + <&ps_atc0_cio_usb>; + + pinctrl-0 = <&acio0_pins>; + pinctrl-names = "default"; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3 0x81000000 0x1000000>; + nonposted-mmio; + + usb4_0_dart: iommu@a80000 { + compatible = "apple,t8110-dart"; + reg = <0xa80000 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + }; + + usb4_0_nhi: nhi@f00000 { + reg = <0xf00000 0x100000>, + <0xdb0000 0x30004>; + reg-names = "nhi", "pdf"; + compatible = "apple,t8112-usb4-nhi", + "apple,t8103-usb4-nhi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = + "txring0", "txring1", "txring2", + "txring3", "txring4", "txring5", + "txring6", "txring7", "txring8", + "txring9", "txring10", "txring11", + "rxring0", "rxring1", "rxring2", + "rxring3", "rxring4", "rxring5", + "rxring6", "rxring7", "rxring8", + "rxring9", "rxring10", "rxring11"; + iommus = <&usb4_0_dart 1>; + /* To be filled by the loader */ + apple,thunderbolt-drom = [00]; + }; + }; + dwc3_0: usb@382280000 { compatible = "apple,t8112-dwc3", "apple,t8103-dwc3"; reg = <0x3 0x82280000 0x0 0xcd00>, <0x3 0x8228cd00 0x0 0x3200>; @@ -1079,6 +1176,95 @@ atcphy0: phy@383000000 { power-domains = <&ps_atc0_usb>; }; + usb4_1_mbox: mailbox@501108000 { + compatible = "apple,t8112-asc-mailbox", + "apple,asc-mailbox-v4"; + reg = <0x5 0x01108000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + }; + + usb4_1_acio: cio@501ac0000 { + compatible = "apple,t8112-usb4-acio", "apple,t8103-usb4-acio"; + reg = <0x5 0x01ac0000 0x0 0xc000>, + <0x5 0x01080000 0x0 0x20000>; + reg-names = "rc", "sram"; + + mboxes = <&usb4_1_mbox>; + resets = <&cio_reset 1>; + + power-domains = <&ps_atc1_cio>, + <&ps_atc1_cio_pcie>, + <&ps_atc1_cio_usb>; + + pinctrl-0 = <&acio1_pins>; + pinctrl-names = "default"; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x5 0x01000000 0x1000000>; + nonposted-mmio; + + usb4_1_dart: iommu@a80000 { + compatible = "apple,t8110-dart"; + reg = <0xa80000 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + #iommu-cells = <1>; + }; + + usb4_1_nhi: nhi@f00000 { + reg = <0xf00000 0x100000>, + <0xdb0000 0x30004>; + reg-names = "nhi", "pdf"; + compatible = "apple,t8112-usb4-nhi", + "apple,t8103-usb4-nhi"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = + "txring0", "txring1", "txring2", + "txring3", "txring4", "txring5", + "txring6", "txring7", "txring8", + "txring9", "txring10", "txring11", + "rxring0", "rxring1", "rxring2", + "rxring3", "rxring4", "rxring5", + "rxring6", "rxring7", "rxring8", + "rxring9", "rxring10", "rxring11"; + iommus = <&usb4_1_dart 1>; + /* To be filled by the loader */ + apple,thunderbolt-drom = [00]; + }; + }; + dwc3_1: usb@502280000 { compatible = "apple,t8112-dwc3", "apple,t8103-dwc3"; reg = <0x5 0x02280000 0x0 0xcd00>, <0x5 0x0228cd00 0x0 0x3200>; -- 2.55.0