Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Documentation/devicetree/bindings/misc/apple,avellino.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/misc/apple,avellino.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Apple Avellino control interface

maintainers:
- Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>

description: |
Addressed Avellino control interfaces on an I2C bus. Describing their
bus addresses does not specify a register protocol or transfer firmware
ownership to the host.

properties:
compatible:
items:
- const: apple,t8112-avellino
- const: apple,avellino

reg:
maxItems: 1

required:
- compatible
- reg

additionalProperties: false
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ properties:
- apple,t6041-radio-pmu
- apple,t6000-wifibt-pmu
- apple,t6000-uwb-pmu
- apple,t8112-wifibt-pmu
- const: apple,radio-pmu

reg:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ properties:
- enum:
- apple,t8103-stockholm-spmi
- apple,t6000-stockholm-spmi
- apple,t8112-stockholm-spmi
- const: apple,stockholm-spmi

reg:
Expand Down
52 changes: 49 additions & 3 deletions Documentation/devicetree/bindings/pci/apple,pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ properties:
- const: apple,t8132-pciec
- const: apple,t8122-pciec
- const: apple,t8103-pciec
- const: apple,t6040-pciec

apple,managed-sids:
$ref: /schemas/types.yaml#/definitions/uint32-array
Expand Down Expand Up @@ -110,7 +111,11 @@ properties:
description:
Interrupt specifiers, one for each root port.
minItems: 1
maxItems: 4
maxItems: 6

interrupt-names:
minItems: 1
maxItems: 6

msi-parent: true

Expand Down Expand Up @@ -211,7 +216,9 @@ allOf:
properties:
compatible:
contains:
const: apple,t8132-pciec
enum:
- apple,t8132-pciec
- apple,t6040-pciec
then:
required:
- apple,msi-vector-base
Expand Down Expand Up @@ -255,6 +262,7 @@ allOf:
enum:
- apple,t8103-pciec
- apple,t6000-pciec
- apple,t6040-pciec
then:
properties:
reg:
Expand Down Expand Up @@ -286,11 +294,49 @@ allOf:
- const: ltssm
- const: intr2axi
- const: oe-fabric
- items:
- const: config
- const: rc
- const: port0
- const: fabric
- const: debug
- const: ioa
- const: ltssm
- const: intr2axi
interrupts:
maxItems: 1
maxItems: 6
ranges:
minItems: 3
maxItems: 3
allOf:
- if:
properties:
compatible:
contains:
const: apple,t6040-pciec
then:
properties:
reg:
minItems: 8
maxItems: 8
interrupts:
minItems: 6
maxItems: 6
interrupt-names:
items:
- const: port
- const: intx-a
- const: intx-b
- const: intx-c
- const: intx-d
- const: parity
required:
- interrupt-names
else:
properties:
interrupts:
maxItems: 1
interrupt-names: false
else:
properties:
resets: false
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/phy/apple,atcrt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ properties:
- enum:
- apple,t8103-atcrt
- apple,t6000-atcrt
- apple,t8112-atcrt
- apple,t6041-atcrt
- const: apple,atcrt

reg:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ description: |

The co-processor exposes the Native Host Interface (NHI) and its DART IOMMU
to the main SoC bus once it is running. They are therefore represented as
child nodes. All child registers are located in a single 16 MiB MMIO window
and use addresses relative to this window.
child nodes. All child registers use addresses relative to the router's MMIO
window. Type 7 expands that window and shifts its child offsets by 16 MiB.

ACIO can only be powered on after the Type-C PHY has been switched to
USB4/Thunderbolt mode. Before the connection to the remote device can be
Expand All @@ -30,6 +30,7 @@ properties:
oneOf:
- const: apple,t8103-usb4-acio
- const: apple,t8142-usb4-acio
- const: apple,t6040-usb4-acio
- items:
- enum:
- apple,t6000-usb4-acio
Expand All @@ -50,7 +51,7 @@ properties:
PCIe adapter configuration space of the USB4 router. Present where
the root complex exposes the adapter separately, so that the tunnel
can be configured before a PCIe-C link is brought up.
- description: MxWrap co-processor control registers, on T8132
- description: MxWrap co-processor control registers

reg-names:
minItems: 2
Expand All @@ -60,6 +61,14 @@ properties:
- const: pcie-adapter
- const: cpu

interrupts:
maxItems: 1
description: Type 7 SRAM parity interrupt

interrupt-names:
items:
- const: sram-parity

mboxes:
maxItems: 1
description: Mailbox used for RTKit communication with the co-processor
Expand Down Expand Up @@ -161,11 +170,12 @@ properties:
required:
- port@1

iommu@a80000:
patternProperties:
"^iommu@(a80000|1a80000)$":
$ref: /schemas/iommu/apple,dart.yaml#
description: DART IOMMU exposed by ACIO and used for DMA from the NHI

nhi@f00000:
"^nhi@(f00000|1f00000)$":
$ref: /schemas/thunderbolt/apple,t8103-usb4-nhi.yaml#
description: Native Host Interface exposed by ACIO

Expand All @@ -182,8 +192,6 @@ required:
- ranges
- nonposted-mmio
- ports
- iommu@a80000
- nhi@f00000

allOf:
- $ref: /schemas/usb/usb-switch.yaml#
Expand All @@ -204,6 +212,21 @@ allOf:
else:
properties:
lstx-gpios: false
- if:
properties:
compatible:
contains:
const: apple,t6040-usb4-acio
then:
required:
- iommu@1a80000
- nhi@1f00000
- interrupts
- interrupt-names
else:
required:
- iommu@a80000
- nhi@f00000

additionalProperties: false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ properties:
oneOf:
- const: apple,t8103-usb4-nhi
- const: apple,t8142-usb4-nhi
- const: apple,t6040-usb4-nhi
- items:
- enum:
- apple,t6000-usb4-nhi
Expand Down Expand Up @@ -124,7 +125,9 @@ allOf:
properties:
compatible:
contains:
const: apple,t8142-usb4-nhi
enum:
- apple,t8142-usb4-nhi
- apple,t6040-usb4-nhi
then:
properties:
reg:
Expand All @@ -147,6 +150,7 @@ allOf:
- apple,t8122-usb4-nhi
- apple,t8132-usb4-nhi
- apple,t8142-usb4-nhi
- apple,t6040-usb4-nhi
then:
properties:
iommus:
Expand Down
108 changes: 108 additions & 0 deletions arch/arm64/boot/dts/apple/t6000-peripherals.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,111 @@
status = "disabled";
};
};

/* CPU and cluster power states are described without granting control. */
&pmgr {
power-controller@0 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x0 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "ecpu0_0";
status = "disabled";
};
power-controller@8 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x8 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "ecpu0_1";
status = "disabled";
};
power-controller@20 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x20 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu0_0";
status = "disabled";
};
power-controller@28 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x28 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu0_1";
status = "disabled";
};
power-controller@30 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x30 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu0_2";
status = "disabled";
};
power-controller@38 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x38 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu0_3";
status = "disabled";
};
power-controller@40 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x40 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu1_0";
status = "disabled";
};
power-controller@48 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x48 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu1_1";
status = "disabled";
};
power-controller@50 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x50 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu1_2";
status = "disabled";
};
power-controller@58 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x58 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpu1_3";
status = "disabled";
};
power-controller@60 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x60 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "ecpm";
status = "disabled";
};
power-controller@68 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x68 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpm0";
status = "disabled";
};
power-controller@70 {
compatible = "apple,t6000-pmgr-pwrstate", "apple,pmgr-pwrstate";
reg = <0x70 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "pcpm1";
status = "disabled";
};
};
18 changes: 18 additions & 0 deletions arch/arm64/boot/dts/apple/t6040-j616s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,24 @@
};
};

&i2c6 {
retimer@18 {
compatible = "apple,t6041-atcrt", "apple,atcrt";
reg = <0x18>;
status = "disabled";
};
retimer@19 {
compatible = "apple,t6041-atcrt", "apple,atcrt";
reg = <0x19>;
status = "disabled";
};
retimer@1a {
compatible = "apple,t6041-atcrt", "apple,atcrt";
reg = <0x1a>;
status = "disabled";
};
};

/* Scaler/CSC (MSR) and its DART, proven on this board. */
&ps_msr0 {
status = "okay";
Expand Down
Loading
Loading