From 76b6d843fef9aa13549b633dc8460ad4a7b5c8fa Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:12:48 -0500 Subject: [PATCH 01/17] arm64: dts: apple: t8132: put the display subsystem under /soc The J713 describes its display subsystem at /soc/display-subsystem, and the shared t8132-dcp.dtsi at /display-subsystem. Use the J713's place, which is also where the M1 and M2 trees put it, so all T8132 boards can share one description. The J713 is the only booted T8132 board and its loader handoff is qualified with this layout. The node stays disabled. The disp0 alias follows it on the J604, J623, J624 and J773g; the J713 and J715 trees do not change. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t8132-dcp.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8132-dcp.dtsi b/arch/arm64/boot/dts/apple/t8132-dcp.dtsi index e87ec0675249a..b4383741a15fb 100644 --- a/arch/arm64/boot/dts/apple/t8132-dcp.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-dcp.dtsi @@ -16,14 +16,6 @@ dcp = &dcp; disp0 = &display; }; - - /* The scanout frontend; it has no registers of its own. */ - display: display-subsystem { - compatible = "apple,t8132-display-subsystem", "apple,t8132-display-diagnostics"; - iommus = <&disp0_dart 0>; - dma-noncoherent; - status = "disabled"; - }; }; &soc { @@ -86,4 +78,12 @@ status = "disabled"; }; }; + + /* The scanout frontend; it has no registers of its own. */ + display: display-subsystem { + compatible = "apple,t8132-display-subsystem", "apple,t8132-display-diagnostics"; + iommus = <&disp0_dart 0>; + dma-noncoherent; + status = "disabled"; + }; }; From 10270079deec05d0bb9a53e834c48b9f5e737f3a Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:14:49 -0500 Subject: [PATCH 02/17] arm64: dts: apple: t8132-j713: mark the GPU and DCP nodes okay The J713 GPU and DCP files enable their nodes by leaving status out; the shared T8132 files, which the J713 is about to use, describe them disabled. Say status = "okay" on the J713 so it can enable them the same way from its board file. Also drop #address-cells and #size-cells from its three DCPs. Their only child, piodma, has no reg, and /soc gives the same 2/2. This removes three W=1 avoid_unnecessary_addr_size warnings per board. No behaviour change. The J713 and J715 dtbs gain status = "okay" on 14 nodes and lose the six cell properties; nothing else changes. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi | 12 ++++++++---- arch/arm64/boot/dts/apple/t8132-j713-display.dtsi | 5 +++-- arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi | 3 +++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi index 49d2983481b04..ebc9c92e17aa5 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi @@ -43,6 +43,7 @@ "recv-empty", "recv-not-empty"; power-domains = <&ps_dispext0_cpu>; #mbox-cells = <0>; + status = "okay"; }; dcpext0_dart: iommu@286340000 { @@ -53,6 +54,7 @@ #iommu-cells = <1>; apple,dma-range = <0x100 0x0 0x10 0x0>; power-domains = <&ps_dispext0_cpu>; + status = "okay"; }; dispext0_dart: iommu@286300000 { @@ -63,6 +65,7 @@ #iommu-cells = <1>; apple,dma-range = <0x100 0x0 0x10 0x0>; power-domains = <&ps_dispext0_cpu>; + status = "okay"; }; dcpext0: dcp@286e00000 { @@ -83,8 +86,7 @@ dma-noncoherent; apple,dcp-index = <1>; apple,bw-scratch = <&pmgr_dcpext 0 4 0>; - #address-cells = <2>; - #size-cells = <2>; + status = "okay"; dcpext0_piodma: piodma { iommus = <&dispext0_dart 16>; @@ -116,6 +118,7 @@ "recv-empty", "recv-not-empty"; power-domains = <&ps_dispext1_cpu>; #mbox-cells = <0>; + status = "okay"; }; dcpext1_dart: iommu@48a340000 { @@ -126,6 +129,7 @@ #iommu-cells = <1>; apple,dma-range = <0x100 0x0 0x10 0x0>; power-domains = <&ps_dispext1_cpu>; + status = "okay"; }; dispext1_dart: iommu@48a300000 { @@ -136,6 +140,7 @@ #iommu-cells = <1>; apple,dma-range = <0x100 0x0 0x10 0x0>; power-domains = <&ps_dispext1_cpu>; + status = "okay"; }; dcpext1: dcp@48ae00000 { @@ -156,8 +161,7 @@ dma-noncoherent; apple,dcp-index = <2>; apple,bw-scratch = <&pmgr_dcpext 1 4 0>; - #address-cells = <2>; - #size-cells = <2>; + status = "okay"; dcpext1_piodma: piodma { iommus = <&dispext1_dart 16>; diff --git a/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi index e3cb6864c54d6..bd156b9b11531 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi @@ -45,6 +45,7 @@ "recv-empty", "recv-not-empty"; power-domains = <&ps_disp_cpu>; #mbox-cells = <0>; + status = "okay"; }; /* DCP firmware DART: SID23. */ @@ -55,6 +56,7 @@ interrupts = ; #iommu-cells = <1>; apple,dma-range = <0x100 0x0 0x10 0x0>; + status = "okay"; }; /* Display frontend DART: SID0 scanout, SID16 PIODMA. */ @@ -89,8 +91,7 @@ /* Full 2560x1664 panel including the notch rows, 224 ppi. */ apple,panel-width-mm = <290>; apple,panel-height-mm = <188>; - #address-cells = <2>; - #size-cells = <2>; + status = "okay"; disp0_piodma: piodma { iommus = <&disp0_dart 16>; diff --git a/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi index 50cd6807d7735..a0536dd91524a 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi @@ -60,6 +60,7 @@ compatible = "apple,t8132-gfx-tvm"; reg = <0x3 0x80760800 0x0 0x4>; #power-domain-cells = <0>; + status = "okay"; }; gpu: gpu@302600000 { @@ -77,6 +78,7 @@ <&gpu_shared_l2>, <&gpu_fw_text>, <&gpu_fw_data>; memory-region-names = "ttbs", "pagetables", "handoff", "shared-l2", "fw-text", "fw-data"; + status = "okay"; }; agx_mbox: mailbox@302608000 { @@ -93,6 +95,7 @@ interrupt-names = "send-empty", "send-not-empty", "recv-empty", "recv-not-empty"; #mbox-cells = <0>; + status = "okay"; }; }; From 411ee8b4b529fdfc0ea43712838e934048e054f8 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:16:52 -0500 Subject: [PATCH 03/17] arm64: dts: apple: t8132-j713: use the shared T8132 files The J713 and J715 kept their own copies of the T8132 GPU, internal and external DCP, ISP and board wiring (t8132-j713-gpu.dtsi, t8132-j713-display.dtsi, t8132-j713-dcpext.dtsi and the first half of t8132-j713-j715.dtsi), while the J604, J623, J624 and J773g use t8132-gpu.dtsi, t8132-dcp.dtsi, t8132-dcpext.dtsi, t8132-isp.dtsi and t8132-board.dtsi. Use the shared files on the Airs too, and keep only what differs in t8132-j713-j715.dtsi: the enables, the panel size and J713 native-handoff flags, the port controllers, the keyboard, trackpad, Touch ID and backlight, the radio's firmware island, the hwmon keys and the external display routes. No output change: the J713 and J715 dtbs are identical under dtc -I dtb -O dts -s; the other dtbs are byte-identical. Signed-off-by: Diljit Singh --- .../boot/dts/apple/t8132-j713-dcpext.dtsi | 326 -------- .../boot/dts/apple/t8132-j713-display.dtsi | 115 --- arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi | 113 --- .../arm64/boot/dts/apple/t8132-j713-j715.dtsi | 722 ++++++++---------- 4 files changed, 300 insertions(+), 976 deletions(-) delete mode 100644 arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi delete mode 100644 arch/arm64/boot/dts/apple/t8132-j713-display.dtsi delete mode 100644 arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi diff --git a/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi deleted file mode 100644 index ebc9c92e17aa5..0000000000000 --- a/arch/arm64/boot/dts/apple/t8132-j713-dcpext.dtsi +++ /dev/null @@ -1,326 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT -/* - * Apple MacBook Air (13-inch, M4) external display coprocessors (DCP-ext). - * - * T8132 has two external display pipes, dispext0 and dispext1, each with - * its own DCP, mailbox, DCP DART and display DART. They mirror the - * internal display (t8132-j713-display.dtsi) at other bases and share its - * firmware clock window (disp-4), which also holds their realtime bandwidth - * request slots in the PMC. - * - * iBoot starts both and leaves them quiesced, as it does the internal one. - * When the boot loader hands them over (opt-in, and only after the internal - * display was handed over), it reserves their firmware memory, publishes - * its UUID and version and marks each node - * apple,t8132-dcpext-firmware-ready. The DCP driver adopts only a marked - * coprocessor, and the DART driver leaves its firmware and display DARTs - * untouched otherwise. PIODMA is enabled at runtime once the display DART - * is adopted. - * - * Streams: SID23 for the firmware, SID0 scanout and SID16 PIODMA, as on - * the internal display. - * - * Copyright The Asahi Linux Contributors - */ - -/ { - aliases { - dcpext0 = &dcpext0; - dcpext1 = &dcpext1; - }; -}; - -&soc { - dcpext0_mbox: mailbox@286e08000 { - compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x2 0x86e08000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - power-domains = <&ps_dispext0_cpu>; - #mbox-cells = <0>; - status = "okay"; - }; - - dcpext0_dart: iommu@286340000 { - compatible = "apple,t8132-dart", "apple,t8110-dart"; - reg = <0x2 0x86340000 0x0 0x20000>; - interrupt-parent = <&aic>; - interrupts = ; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x10 0x0>; - power-domains = <&ps_dispext0_cpu>; - status = "okay"; - }; - - dispext0_dart: iommu@286300000 { - compatible = "apple,t8132-dart", "apple,t8110-dart"; - reg = <0x2 0x86300000 0x0 0xc000>; - interrupt-parent = <&aic>; - interrupts = ; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x10 0x0>; - power-domains = <&ps_dispext0_cpu>; - status = "okay"; - }; - - dcpext0: dcp@286e00000 { - compatible = "apple,t8132-dcpext"; - reg = <0x2 0x86e00000 0x0 0x4000>, - <0x2 0x84000000 0x0 0xc20000>, - <0x2 0x86240000 0x0 0x10000>, - <0x2 0x863a8000 0x0 0x4000>, - <0x2 0x86800000 0x0 0x800000>, - <0x3 0x82800000 0x0 0xbc000>, - <0x2 0x86850000 0x0 0x4000>; - reg-names = "coproc", "disp-0", "disp-1", "disp-2", "disp-3", - "disp-4", "iop-vbar"; - mboxes = <&dcpext0_mbox>; - mbox-names = "mbox"; - iommus = <&dcpext0_dart 23>; - power-domains = <&ps_dispext0_cpu>; - dma-noncoherent; - apple,dcp-index = <1>; - apple,bw-scratch = <&pmgr_dcpext 0 4 0>; - status = "okay"; - - dcpext0_piodma: piodma { - iommus = <&dispext0_dart 16>; - dma-noncoherent; - status = "disabled"; - }; - }; - - /* - * The external pipes' realtime bandwidth request slots in the PMC, - * 0x2c000 and 0x30000 into the window the dcpexts have as disp-4. - */ - pmgr_dcpext: power-management@38282c000 { - reg = <0x3 0x8282c000 0x0 0x8>, - <0x3 0x82830000 0x0 0x8>; - reg-names = "dcpext0-bw-scratch", "dcpext1-bw-scratch"; - #apple,bw-scratch-cells = <3>; - }; - - dcpext1_mbox: mailbox@48ae08000 { - compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x4 0x8ae08000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - power-domains = <&ps_dispext1_cpu>; - #mbox-cells = <0>; - status = "okay"; - }; - - dcpext1_dart: iommu@48a340000 { - compatible = "apple,t8132-dart", "apple,t8110-dart"; - reg = <0x4 0x8a340000 0x0 0x20000>; - interrupt-parent = <&aic>; - interrupts = ; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x10 0x0>; - power-domains = <&ps_dispext1_cpu>; - status = "okay"; - }; - - dispext1_dart: iommu@48a300000 { - compatible = "apple,t8132-dart", "apple,t8110-dart"; - reg = <0x4 0x8a300000 0x0 0xc000>; - interrupt-parent = <&aic>; - interrupts = ; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x10 0x0>; - power-domains = <&ps_dispext1_cpu>; - status = "okay"; - }; - - dcpext1: dcp@48ae00000 { - compatible = "apple,t8132-dcpext"; - reg = <0x4 0x8ae00000 0x0 0x4000>, - <0x4 0x88000000 0x0 0xc20000>, - <0x4 0x8a240000 0x0 0x10000>, - <0x4 0x8a3a8000 0x0 0x4000>, - <0x4 0x8a800000 0x0 0x800000>, - <0x3 0x82800000 0x0 0xbc000>, - <0x4 0x8a850000 0x0 0x4000>; - reg-names = "coproc", "disp-0", "disp-1", "disp-2", "disp-3", - "disp-4", "iop-vbar"; - mboxes = <&dcpext1_mbox>; - mbox-names = "mbox"; - iommus = <&dcpext1_dart 23>; - power-domains = <&ps_dispext1_cpu>; - dma-noncoherent; - apple,dcp-index = <2>; - apple,bw-scratch = <&pmgr_dcpext 1 4 0>; - status = "okay"; - - dcpext1_piodma: piodma { - iommus = <&dispext1_dart 16>; - dma-noncoherent; - status = "disabled"; - }; - }; -}; - -/* - * The display crossbars of both ATCs, for the dcpexts' Type-C routes. Probe - * touches no register; an output is only programmed once it is selected. - */ -&atc0_dpxbar { - status = "okay"; -}; - -&atc1_dpxbar { - status = "okay"; -}; - -/* - * dcpext0's Type-C routes, UFP mux selector 2 on both ATC crossbars - * (cells 0/1/2: DP PHY, DP IN0, DP IN1). The ATC PHYs have no DP alt mode: - * the routes are for DisplayPort tunnels, and DP alt mode is refused. The - * routes are disabled here; the display gate enables them only for a dcpext - * the boot loader handed over, since a USB-C port controller waits for every - * available route. - */ -&dcpext0 { - apple,connector-type = "USB-C"; - phys = <&atcphy0 PHY_TYPE_DP>, <&atcphy1 PHY_TYPE_DP>; - phy-names = "typec0", "typec1"; - mux-controls = <&atc0_dpxbar 0>, <&atc1_dpxbar 0>, - <&atc0_dpxbar 1>, <&atc0_dpxbar 2>, - <&atc1_dpxbar 1>, <&atc1_dpxbar 2>; - mux-control-names = "typec0", "typec1", - "typec0-dpin0", "typec0-dpin1", - "typec1-dpin0", "typec1-dpin1"; - apple,typec-mux-indices = <2 2>; - apple,typec-dptx-phys = <0 1>; - - typec-routes { - #address-cells = <1>; - #size-cells = <0>; - - route@0 { - reg = <0>; - mode-switch; - status = "disabled"; - - port { - dcpext0_typec0: endpoint { - remote-endpoint = <&typec0_dcpext0>; - }; - }; - }; - - route@1 { - reg = <1>; - mode-switch; - status = "disabled"; - - port { - dcpext0_typec1: endpoint { - remote-endpoint = <&typec1_dcpext0>; - }; - }; - }; - }; -}; - -/* - * dcpext1's Type-C routes, UFP mux selector 4 on both ATC crossbars - * (cells 0/1/2: DP PHY, DP IN0, DP IN1). The ATC PHYs have no DP alt mode: - * the routes are for DisplayPort tunnels, and DP alt mode is refused. The - * routes are disabled here; the display gate enables them only for a dcpext - * the boot loader handed over, since a USB-C port controller waits for every - * available route. - */ -&dcpext1 { - apple,connector-type = "USB-C"; - phys = <&atcphy0 PHY_TYPE_DP>, <&atcphy1 PHY_TYPE_DP>; - phy-names = "typec0", "typec1"; - mux-controls = <&atc0_dpxbar 0>, <&atc1_dpxbar 0>, - <&atc0_dpxbar 1>, <&atc0_dpxbar 2>, - <&atc1_dpxbar 1>, <&atc1_dpxbar 2>; - mux-control-names = "typec0", "typec1", - "typec0-dpin0", "typec0-dpin1", - "typec1-dpin0", "typec1-dpin1"; - apple,typec-mux-indices = <4 4>; - apple,typec-dptx-phys = <0 1>; - - typec-routes { - #address-cells = <1>; - #size-cells = <0>; - - route@0 { - reg = <0>; - mode-switch; - status = "disabled"; - - port { - dcpext1_typec0: endpoint { - remote-endpoint = <&typec0_dcpext1>; - }; - }; - }; - - route@1 { - reg = <1>; - mode-switch; - status = "disabled"; - - port { - dcpext1_typec1: endpoint { - remote-endpoint = <&typec1_dcpext1>; - }; - }; - }; - }; -}; - -&typec0 { - ports { - port@3 { - reg = <3>; - #address-cells = <1>; - #size-cells = <0>; - - typec0_dcpext0: endpoint@0 { - reg = <0>; - remote-endpoint = <&dcpext0_typec0>; - }; - - typec0_dcpext1: endpoint@1 { - reg = <1>; - remote-endpoint = <&dcpext1_typec0>; - }; - }; - }; -}; - -&typec1 { - ports { - port@3 { - reg = <3>; - #address-cells = <1>; - #size-cells = <0>; - - typec1_dcpext0: endpoint@0 { - reg = <0>; - remote-endpoint = <&dcpext0_typec1>; - }; - - typec1_dcpext1: endpoint@1 { - reg = <1>; - remote-endpoint = <&dcpext1_typec1>; - }; - }; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi deleted file mode 100644 index bd156b9b11531..0000000000000 --- a/arch/arm64/boot/dts/apple/t8132-j713-display.dtsi +++ /dev/null @@ -1,115 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT -/* - * Apple MacBook Air (13-inch, M4) internal display coprocessor (DCP). - * - * Node structure and values match the cleanroom J713 live device tree. - * The DCP, its mailbox and both display DARTs are live when Linux starts: - * the DART driver leaves the DARTs untouched until apple_dart.j713_dcp or - * apple_dart.j713_display is set and the device re-probed, and the DCP - * common Apple display driver (appledrm) adopts the inherited session after - * guarded DART admission; no display lifecycle sysfs triggers are required. - * - * The boot loader completes these nodes. On dcp it publishes - * apple,firmware-uuid, -version and -compat and the memory-region list of - * DCP firmware reservations (apple,asc-mem, no-map, with iommu-addresses, - * plus one apple,dcp-os-log region). After validating the inherited - * frontend mappings it adds memory-region and apple,j713-inherited-mappings - * to piodma and display-subsystem and enables them and disp0_dart. - * apple,j713-native-piodma and apple,j713-native-scanout opt in to that. - * The DCP, PIODMA and scanout paths use non-coherent DMA only, so those - * nodes are marked dma-noncoherent. - * The DART driver also reads the ADT through the loader's phram "adt" - * region. Without that handoff the DCP and frontend are refused. - * - * Copyright The Asahi Linux Contributors - */ - -/ { - aliases { - dcp = &dcp; - disp0 = &display; - disp0_piodma = &disp0_piodma; - }; -}; - -&soc { - dcp_mbox: mailbox@30ae08000 { - compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x3 0x0ae08000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - power-domains = <&ps_disp_cpu>; - #mbox-cells = <0>; - status = "okay"; - }; - - /* DCP firmware DART: SID23. */ - dcp_dart: iommu@30a340000 { - compatible = "apple,t8132-dart", "apple,t8110-dart"; - reg = <0x3 0x0a340000 0x0 0x20000>; - interrupt-parent = <&aic>; - interrupts = ; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x10 0x0>; - status = "okay"; - }; - - /* Display frontend DART: SID0 scanout, SID16 PIODMA. */ - disp0_dart: iommu@30a300000 { - compatible = "apple,t8132-dart", "apple,t8110-dart"; - reg = <0x3 0x0a300000 0x0 0xc000>; - interrupt-parent = <&aic>; - interrupts = ; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x10 0x0>; - status = "disabled"; /* Enabled by the loader. */ - }; - - dcp: dcp@30ae00000 { - compatible = "apple,t8132-dcp"; - reg = <0x3 0x0ae00000 0x0 0x4000>, - <0x3 0x08000000 0x0 0xc20000>, - <0x3 0x0a240000 0x0 0x10000>, - <0x3 0x0a3a8000 0x0 0x4000>, - <0x3 0x0a800000 0x0 0x800000>, - <0x3 0x82800000 0x0 0xbc000>, - <0x3 0x0a850000 0x0 0x4000>; - reg-names = "coproc", "disp-0", "disp-1", "disp-2", "disp-3", - "disp-4", "iop-vbar"; - mboxes = <&dcp_mbox>; - mbox-names = "mbox"; - iommus = <&dcp_dart 23>; - power-domains = <&ps_disp_cpu>; - dma-noncoherent; - apple,j713-native-piodma; - apple,j713-native-scanout; - /* Full 2560x1664 panel including the notch rows, 224 ppi. */ - apple,panel-width-mm = <290>; - apple,panel-height-mm = <188>; - status = "okay"; - - disp0_piodma: piodma { - iommus = <&disp0_dart 16>; - dma-noncoherent; - status = "disabled"; /* Enabled by the loader. */ - }; - }; - - display: display-subsystem { - compatible = "apple,t8132-display-subsystem", "apple,t8132-display-diagnostics"; - iommus = <&disp0_dart 0>; - dma-noncoherent; - status = "disabled"; /* Enabled by the loader. */ - }; -}; - -/* - * The shared J713 power-domain policy leaves the running display domains - * firmware-owned. Native display adoption does not register a second genpd - * owner or change their hardware state. - */ diff --git a/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi deleted file mode 100644 index a0536dd91524a..0000000000000 --- a/arch/arm64/boot/dts/apple/t8132-j713-gpu.dtsi +++ /dev/null @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT -/* - * Apple MacBook Air (13-inch, M4) G16 GPU resources. - * - * Node structure follows the J713 ADT; values match the cleanroom J713 live - * device tree. The Rust Asahi G16 backend is loaded explicitly after the - * native display and GFX TVM supplier are ready. m1n1 fills the inherited UAT - * and firmware ranges below, sets them okay, and publishes the firmware - * segment layout on the gpu node; Asahi validates this handoff before boot. - * - * Copyright The Asahi Linux Contributors - */ - -/ { - aliases { - gpu = &gpu; - }; - - reserved-memory { - gpu_ttbs: uat-ttbs { - reg = <0 0 0 0>; - no-map; - status = "disabled"; - }; - - gpu_pagetables: uat-pagetables { - reg = <0 0 0 0>; - no-map; - status = "disabled"; - }; - - gpu_handoff: uat-handoff { - reg = <0 0 0 0>; - no-map; - status = "disabled"; - }; - - gpu_shared_l2: uat-shared-l2 { - reg = <0 0 0 0>; - no-map; - status = "disabled"; - }; - - gpu_fw_text: gpu-fw-text { - reg = <0 0 0 0>; - no-map; - status = "disabled"; - }; - - gpu_fw_data: gpu-fw-data { - reg = <0 0 0 0>; - no-map; - status = "disabled"; - }; - }; -}; - -&soc { - gfx_tvm: power-controller@380760800 { - compatible = "apple,t8132-gfx-tvm"; - reg = <0x3 0x80760800 0x0 0x4>; - #power-domain-cells = <0>; - status = "okay"; - }; - - gpu: gpu@302600000 { - compatible = "apple,agx-t8132"; - reg = <0x3 0x02600000 0x0 0x4000>, - <0x3 0x00000000 0x0 0x4000000>; - reg-names = "asc", "sgx"; - mboxes = <&agx_mbox>; - power-domains = <&ps_gfx>; - /* G16 is admitted on non-coherent DMA only. */ - dma-noncoherent; - apple,pmp = <&pmp>; - apple,clpc = <&clpc>; - memory-region = <&gpu_ttbs>, <&gpu_pagetables>, <&gpu_handoff>, - <&gpu_shared_l2>, <&gpu_fw_text>, <&gpu_fw_data>; - memory-region-names = "ttbs", "pagetables", "handoff", - "shared-l2", "fw-text", "fw-data"; - status = "okay"; - }; - - agx_mbox: mailbox@302608000 { - /* ASCWrap v6 contains the same mailbox aperture used by ASC v4. */ - compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x3 0x02608000 0x0 0x4000>; - /* Idle ring-service kicks need not wake the system. */ - apple,hold-rx-in-sleep; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - #mbox-cells = <0>; - status = "okay"; - }; -}; - -/* The outer TVM gate is the parent of the GFX PMGR domain on J713. */ -&ps_gfx { - status = "okay"; - power-domains = <&gfx_tvm>; - /* The G16 firmware stays live across suspend-to-idle. */ - apple,sleep-retained; -}; - -/* The existing report provider owns readiness for shared PMP commands. */ -&pmp { - apple,pmp-report = <&pmp_report>; -}; diff --git a/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi index f510a2be2ead4..85d3e20c3dab9 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi @@ -2,14 +2,18 @@ /* * Apple MacBook Air (13-inch and 15-inch, M4, 2025) * - * The parts the J713 and J715 share. Their ADTs differ in the panel, the - * speakers, the radio's firmware island and the ATC PHY trims; the J715 - * overrides the last two, and each board adds its own panel, speakers and - * firmware names. + * The parts the J713 and J715 share. The J715 overrides the radio's + * firmware island and the ATC PHY trims; each board adds its panel, + * speakers and firmware names. * * Copyright The Asahi Linux Contributors */ +#include "t8132-board.dtsi" +#include "t8132-isp.dtsi" +#include "t8132-gpu.dtsi" +#include "t8132-dcp.dtsi" +#include "t8132-dcpext.dtsi" #include "t8132-j713-pmgr.dtsi" #include #include @@ -18,30 +22,18 @@ / { aliases { - sep = &sep; - ans = &nvme; - ans-mbox = &ans_mbox; - atcphy0 = &atcphy0; - atcphy1 = &atcphy1; - bluetooth0 = &bluetooth0; + disp0_piodma = &disp0_piodma; keyboard = &keyboard; - nvram = &nvram; - pmu-primary = &pmic1; - pmp = &pmp; - sart-ans = &sart; - spmi-primary = &nub_spmi; - wifi0 = &wifi0; }; chosen { - linux-enablement-mac,disk-boot; linux-enablement-mac,dapf-handoff = "/arm-io/aop", "/arm-io/mtp", "/arm-io/pmp"; - linux-enablement-mac,dapf-power-on-handoff = "/arm-io/pmp"; }; led-controller { compatible = "pwm-leds"; + led-0 { pwms = <&fpwm1 0 40000>; label = "kbd_backlight"; @@ -51,90 +43,48 @@ default-state = "keep"; }; }; +}; - reserved-memory { - /* - * iBoot loads the ISP firmware outside the kernel's memory, at - * addresses that move with the boot firmware. The boot loader - * fills these placeholders from the ADT's isp segment-ranges: reg, - * and iommu-addresses where the firmware runs them, from - * 0x100_0000_0000 on. The driver checks that the coprocessor's - * reset vector is this text before it starts the firmware. - */ - isp_fw_text: isp-firmware-text { }; - - isp_fw_data: isp-firmware-data { }; - - /* the firmware's 20 MiB main memory, the driver allocates above it */ - isp_heap: isp-heap { - iommu-addresses = <&isp 0x100 0x0 0x0 0x1400000>; - }; - }; +/* The J713 loader tree has these placeholders. */ +&gpu_ttbs { + reg = <0 0 0 0>; +}; - /* - * The boot NOR runs from a PMU rail that is on whenever the SoC is - * and that no OS switches. The ADT gives the flash no supply. - */ - nor_flash_vcc: regulator-nor-flash-vcc { - compatible = "regulator-fixed"; - regulator-name = "nor-flash-vcc"; - regulator-always-on; - }; +&gpu_pagetables { + reg = <0 0 0 0>; }; -/* - * The boot loader enables the ISP and its DARTs once it has filled the - * firmware placeholders and set apple,platform-id, the ADT isp node's - * sensor-type (neither ADT has a cam-connections-scheme). - */ -&isp { - memory-region = <&isp_fw_text>, <&isp_fw_data>, <&isp_heap>; - memory-region-names = "text", "data", "heap"; - - /* The front camera, an IMX958: configuration 5, as on the J616s. */ - sensor-presets { - /* 1920x1080 */ - preset0 { - apple,config-index = <5>; - apple,input-size = <1920 2160>; - apple,output-size = <1920 1080>; - apple,crop = <0 0 1920 1080>; - }; - /* 1280x720 */ - preset1 { - apple,config-index = <5>; - apple,input-size = <1920 2160>; - apple,output-size = <1280 720>; - apple,crop = <0 0 1280 720>; - }; - }; +&gpu_handoff { + reg = <0 0 0 0>; }; -/* - * m1n1 programs the AOP DART's DAPF and reserves the firmware segments and - * the DAPF windows in memory-region when /chosen asks for the AOP's handoff, - * or disables the AOP. - */ -&aop { - status = "okay"; +&gpu_shared_l2 { + reg = <0 0 0 0>; +}; + +&gpu_fw_text { + reg = <0 0 0 0>; +}; + +&gpu_fw_data { + reg = <0 0 0 0>; +}; + +&framebuffer0 { + /delete-property/ power-domains; + panel = <&fb_panel>; }; &aop_audio { /* - * The microphones on LEAP; the speakers and their sense on base-ns TX0 - * and RX0 (the J616s stream: six playback and twelve sense slots; the - * J713's four amps take the first four and eight, the J715's six all - * of them), the jack on TX2 and RX2. + * Microphones on LEAP; speakers and their sense on TX0/RX0; the jack + * on TX2/RX2. */ dmas = <&admac0 1>, <&admac1 0>, <&admac1 1>, <&admac1 4>, <&admac1 5>; dma-names = "dma", "spkr", "sense", "cout", "cin"; }; -/* - * The CS42L84 headphone codec (ADT /arm-io/i2c1/audio-codec-output at 0x4b). - * Its reset line is nub GPIO 17, driven high to run the codec; its interrupt - * is AP GPIO 98, level low. The AOP firmware runs the jack's stream. - */ +/* CS42L84 headphone codec: reset on nub GPIO 17, IRQ on AP GPIO 98. */ &i2c1 { status = "okay"; @@ -148,71 +98,7 @@ }; }; -&aop_dart { - status = "okay"; -}; - -&aop_mbox { - status = "okay"; - /* A periodic report need not wake the system. */ - apple,hold-rx-in-sleep; -}; - -&admac0 { - status = "okay"; -}; - -&admac1 { - status = "okay"; -}; - -/* Enable DVFS only with the board thermal owner. */ -&cpufreq_e { - status = "okay"; -}; - -&cpufreq_p { - status = "okay"; -}; - -&cpuidle { - status = "okay"; -}; - -&qspi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - vcc-supply = <&nor_flash_vcc>; - spi-rx-bus-width = <1>; - spi-tx-bus-width = <1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - nvram: partition@700000 { - label = "nvram"; - /* ADT /arm-io/qspi/spinor/anvram, flash-relative. */ - reg = <0x700000 0x100000>; - }; - }; - }; -}; - -/* - * m1n1 performs the T8132 controller and PHY initialization. Linux adopts - * the trained link and owns DART stream 16, RID-to-SID routing and MSI. - * - * The DART fault interrupt is taken from the ADT, independently of - * the PCIe port and MSI interrupts. - */ &nub_spmi_a0 { - status = "okay"; hpm1: usb-pd@a { compatible = "apple,t8132-sn201202x", "apple,sn201202x"; reg = <0xa SPMI_USID>; @@ -248,6 +134,7 @@ }; }; }; + hpm0: usb-pd@c { compatible = "apple,t8132-sn201202x", "apple,sn201202x"; reg = <0xc SPMI_USID>; @@ -285,367 +172,358 @@ }; }; -&pmp_dart { - status = "okay"; +/* The radio's firmware island: the J713's here, the J715 overrides it. */ +&wifi0 { + brcm,board-type = "apple,garden"; }; -&pmp_report { - status = "okay"; +&bluetooth0 { + brcm,board-type = "apple,garden"; }; -&pmp_mbox { +&fpwm1 { status = "okay"; }; -&atcphy0 { - status = "okay"; - /* Leave the display crossbar at core + 0x4c000 to its own driver. */ - reg = <0x4 0x02a90000 0x0 0x4000>, - <0x4 0x02a84000 0x0 0x4000>, - <0x4 0x03000000 0x0 0x24000>, - <0x4 0x00000000 0x0 0x8000>, - <0x4 0x00020000 0x0 0x4000>, - <0x4 0x03044000 0x0 0x4000>, - <0x4 0x03050000 0x0 0x4000>; - reg-names = "usb2phy", "pipehandler", "core", "axi2af", "lioa", - "fabric", "common-config"; - ports { - #address-cells = <1>; - #size-cells = <0>; +/* An external pipe's PMC enables follow its SYS state, before its FE. */ +&ps_dispext0_fe { + power-domains = <&ps_dispext0_sys>, <&pmc_dispext0>; +}; - port@0 { - reg = <0>; - atcphy0_typec_lanes: endpoint { - remote-endpoint = <&typec0_connector_ss>; - }; - }; +&ps_dispext1_fe { + power-domains = <&ps_dispext1_sys>, <&pmc_dispext1>; +}; + +&smc_hwmon { + current-ID0R { + apple,key-id = "ID0R"; + label = "AC Input Current"; + }; + + /* Panel and backlight supply; tracks brightness, idles when blanked. */ + current-Ib8f { + apple,key-id = "Ib8f"; + label = "Display Supply Current"; + }; + + power-PDTR { + apple,key-id = "PDTR"; + label = "AC Input Power"; + }; + + power-PMVC { + apple,key-id = "PMVC"; + label = "3.8 V Rail Power"; + }; + + power-PSTR { + apple,key-id = "PSTR"; + label = "Total System Power"; + }; + + temperature-TB0T { + apple,key-id = "TB0T"; + label = "Battery Hotspot"; + }; + + temperature-TCHP { + apple,key-id = "TCHP"; + label = "Charge Regulator Temp"; + }; + + temperature-TH0x { + apple,key-id = "TH0x"; + label = "NAND Flash Temperature"; + }; + + temperature-TW0P { + apple,key-id = "TW0P"; + label = "WiFi/BT Module Temp"; + }; + + voltage-SBAV { + apple,key-id = "SBAV"; + label = "Battery Voltage"; + }; + + voltage-VD0R { + apple,key-id = "VD0R"; + label = "Charger Input Voltage"; }; }; -&dwc3_0_dart_0 { +&mtp { status = "okay"; }; -&dwc3_0_dart_1 { +&mtp_mbox { status = "okay"; }; -&dwc3_0 { +&mtp_dart { status = "okay"; - dr_mode = "host"; - maximum-speed = "super-speed"; - phys = <&atcphy0 PHY_TYPE_USB2>, <&atcphy0 PHY_TYPE_USB3>; - phy-names = "usb2-phy", "usb3-phy"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - dwc3_0_hs: endpoint { - remote-endpoint = <&typec0_connector_hs>; - }; - }; - }; }; -&atcphy1 { +&mtp_dockchannel { status = "okay"; - /* Leave the display crossbar at core + 0x4c000 to its own driver. */ - reg = <0x4 0x0aa90000 0x0 0x4000>, - <0x4 0x0aa84000 0x0 0x4000>, - <0x4 0x0b000000 0x0 0x24000>, - <0x4 0x08000000 0x0 0x8000>, - <0x4 0x08020000 0x0 0x4000>, - <0x4 0x0b044000 0x0 0x4000>, - <0x4 0x0b050000 0x0 0x4000>; - reg-names = "usb2phy", "pipehandler", "core", "axi2af", "lioa", - "fabric", "common-config"; - ports { - #address-cells = <1>; - #size-cells = <0>; +}; - port@0 { - reg = <0>; - atcphy1_typec_lanes: endpoint { - remote-endpoint = <&typec1_connector_ss>; - }; - }; +&mtp_hid { + apple,afe-reset-gpios = <&smc_gpio 28 GPIO_ACTIVE_LOW>; + apple,stm-reset-gpios = <&smc_gpio 29 GPIO_ACTIVE_LOW>; + + multi-touch { + apple,power-method = <2>; }; -}; -&dwc3_1_dart_0 { - status = "okay"; + keyboard: keyboard { + hid-country-code = <0>; + apple,keyboard-layout-id = <0>; + }; + + stm { + }; }; -&dwc3_1_dart_1 { +/* Mesa fingerprint sensor: power on nub GPIO 28, data-ready on AP GPIO 199. */ +&spi2 { status = "okay"; }; -&dwc3_1 { +&mesa { + enable-gpios = <&pinctrl_nub 28 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&pinctrl_ap>; + interrupts = <199 IRQ_TYPE_EDGE_RISING>; + spi-cs-setup-delay-ns = <20>; + spi-cs-hold-delay-ns = <20>; status = "okay"; - dr_mode = "host"; - maximum-speed = "super-speed"; - phys = <&atcphy1 PHY_TYPE_USB2>, <&atcphy1 PHY_TYPE_USB3>; - phy-names = "usb2-phy", "usb3-phy"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - dwc3_1_hs: endpoint { - remote-endpoint = <&typec1_connector_hs>; - }; - }; - }; }; -&dart_apcie0 { +/* GPU: the outer TVM gate is the parent of the GFX domain. */ +&gfx_tvm { status = "okay"; - apple,managed-sids = <1 2>; - apple,dma-range = <0x100 0x00100000 0x0 0x3fe00000>; }; -/* The radio's board-type is its firmware island: the J713's here. */ -&pcie0 { +&gpu { status = "okay"; - apple,managed-sids = <1 2>; - iommu-map = <0x100 &dart_apcie0 1 2>; - iommu-map-mask = <0xffff>; - pci@0,0 { - pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; - reset-gpios = <&pinctrl_ap 163 GPIO_ACTIVE_LOW>; - bluetooth0: bluetooth@0,1 { - compatible = "pci14e4,5f72"; - reg = <0x10100 0x0 0x0 0x0 0x0>; - brcm,board-type = "apple,garden"; - /* Per-machine address and calibration supplied by m1n1. */ - local-bd-address = [00 00 00 00 00 00]; - }; - wifi0: wifi@0,0 { - compatible = "pci14e4,4434"; - reg = <0x10000 0x0 0x0 0x0 0x0>; - brcm,board-type = "apple,garden"; - local-mac-address = [00 00 00 00 00 00]; - apple,antenna-sku = "XX"; - }; - }; }; -&fpwm1 { +&agx_mbox { status = "okay"; }; -&mcc { +&ps_gfx { + power-domains = <&gfx_tvm>; + /* The G16 firmware stays live across suspend-to-idle. */ + apple,sleep-retained; status = "okay"; - apple,boot-dma-devices = <&pmp>; }; -&pmc { - status = "okay"; - apple,static-voters = <3>; +/* The report provider owns readiness for shared PMP commands. */ +&pmp { + apple,pmp-report = <&pmp_report>; }; /* - * The PMC enables of an external pipe are set once the pipe's SYS state is - * on, and before its FE state powers on. + * Internal display: the loader enables disp0_dart, piodma and the display + * subsystem once it has validated the inherited frontend mappings. */ -&ps_dispext0_fe { - power-domains = <&ps_dispext0_sys>, <&pmc_dispext0>; +&dcp_mbox { + status = "okay"; }; -&ps_dispext1_fe { - power-domains = <&ps_dispext1_sys>, <&pmc_dispext1>; +&dcp_dart { + status = "okay"; }; -&smc { +&dcp { + apple,j713-native-piodma; + apple,j713-native-scanout; + /* Full 2560x1664 panel including the notch rows, 224 ppi. */ + apple,panel-width-mm = <290>; + apple,panel-height-mm = <188>; status = "okay"; - - hwmon { - compatible = "apple,smc-hwmon"; - - current-ID0R { - apple,key-id = "ID0R"; - label = "AC Input Current"; - }; - - /* Panel and backlight supply; tracks brightness, idles when blanked. */ - current-Ib8f { - apple,key-id = "Ib8f"; - label = "Display Supply Current"; - }; - - power-PDTR { - apple,key-id = "PDTR"; - label = "AC Input Power"; - }; - - power-PMVC { - apple,key-id = "PMVC"; - label = "3.8 V Rail Power"; - }; - - power-PSTR { - apple,key-id = "PSTR"; - label = "Total System Power"; - }; - - temperature-TB0T { - apple,key-id = "TB0T"; - label = "Battery Hotspot"; - }; - - temperature-TCHP { - apple,key-id = "TCHP"; - label = "Charge Regulator Temp"; - }; - - temperature-TH0x { - apple,key-id = "TH0x"; - label = "NAND Flash Temperature"; - }; - - temperature-TW0P { - apple,key-id = "TW0P"; - label = "WiFi/BT Module Temp"; - }; - - voltage-SBAV { - apple,key-id = "SBAV"; - label = "Battery Voltage"; - }; - - voltage-VD0R { - apple,key-id = "VD0R"; - label = "Charger Input Voltage"; - }; - }; - - rtc { - compatible = "apple,smc-rtc"; - nvmem-cells = <&rtc_offset>; - nvmem-cell-names = "rtc_offset"; - }; - - reboot { - compatible = "apple,t8132-smc-reboot", "apple,smc-reboot"; - nvmem-cells = <&shutdown_flag>, <&boot_stage>, - <&boot_error_count>, <&panic_count>; - nvmem-cell-names = "shutdown_flag", "boot_stage", - "boot_error_count", "panic_count"; - }; }; -&smc_mbox { +/* External displays: both pipes, routed to either USB-C port. */ +&dcpext0_mbox { status = "okay"; }; -&nub_spmi { +&dcpext0_dart { status = "okay"; +}; - pmic1: pmic@0 { - compatible = "apple,abbey-pmic", "apple,spmi-nvmem"; - reg = <0x0 SPMI_USID>; /* To be filled by loader */ - - nvmem-layout { - compatible = "fixed-layout"; - #address-cells = <1>; - #size-cells = <1>; - - rtc_offset: rtc-offset@2100 { - reg = <0x2100 0x6>; - }; - - boot_stage: boot-stage@f801 { - reg = <0xf801 0x1>; - }; - - boot_error_count: boot-error-count@f802,0 { - reg = <0xf802 0x1>; - bits = <0 4>; - }; - - panic_count: panic-count@f802,4 { - reg = <0xf802 0x1>; - bits = <4 4>; - }; +&dispext0_dart { + status = "okay"; +}; - shutdown_flag: shutdown-flag@f80f,3 { - reg = <0xf80f 0x1>; - bits = <3 1>; - }; - }; - }; +&dcpext1_mbox { + status = "okay"; }; -&mtp { +&dcpext1_dart { status = "okay"; }; -&mtp_mbox { +&dispext1_dart { status = "okay"; }; -&mtp_dart { +&atc0_dpxbar { status = "okay"; }; -&mtp_dockchannel { +&atc1_dpxbar { status = "okay"; }; -&mtp_hid { - apple,afe-reset-gpios = <&smc_gpio 28 GPIO_ACTIVE_LOW>; - apple,stm-reset-gpios = <&smc_gpio 29 GPIO_ACTIVE_LOW>; +/* + * dcpext0's Type-C routes, UFP mux selector 2 on both ATC crossbars + * (cells 0/1/2: DP PHY, DP IN0, DP IN1). The ATC PHYs have no DP alt mode: + * the routes are for DisplayPort tunnels, and DP alt mode is refused. The + * routes are disabled here; the display gate enables them only for a dcpext + * the boot loader handed over, since a USB-C port controller waits for every + * available route. + */ +&dcpext0 { + apple,connector-type = "USB-C"; + phys = <&atcphy0 PHY_TYPE_DP>, <&atcphy1 PHY_TYPE_DP>; + phy-names = "typec0", "typec1"; + mux-controls = <&atc0_dpxbar 0>, <&atc1_dpxbar 0>, + <&atc0_dpxbar 1>, <&atc0_dpxbar 2>, + <&atc1_dpxbar 1>, <&atc1_dpxbar 2>; + mux-control-names = "typec0", "typec1", + "typec0-dpin0", "typec0-dpin1", + "typec1-dpin0", "typec1-dpin1"; + apple,typec-mux-indices = <2 2>; + apple,typec-dptx-phys = <0 1>; + + status = "okay"; + + typec-routes { + #address-cells = <1>; + #size-cells = <0>; - multi-touch { - apple,power-method = <2>; - }; + route@0 { + reg = <0>; + mode-switch; + status = "disabled"; - keyboard: keyboard { - hid-country-code = <0>; - apple,keyboard-layout-id = <0>; - }; + port { + dcpext0_typec0: endpoint { + remote-endpoint = <&typec0_dcpext0>; + }; + }; + }; - stm { + route@1 { + reg = <1>; + mode-switch; + status = "disabled"; + + port { + dcpext0_typec1: endpoint { + remote-endpoint = <&typec1_dcpext0>; + }; + }; + }; }; }; /* - * These blocks are initialized and retained by iBoot/DCP. Linux does not yet - * own the T8132 display power sequence, and the GPIO block must remain live - * for inherited firmware and input state. - */ -/* - * Mesa fingerprint sensor on spi2 (ADT /arm-io/spi2/mesa): power on - * NUB GPIO 28, active high; data-ready on AP GPIO 199. Native chip select only. + * dcpext1's Type-C routes, UFP mux selector 4 on both ATC crossbars + * (cells 0/1/2: DP PHY, DP IN0, DP IN1). The ATC PHYs have no DP alt mode: + * the routes are for DisplayPort tunnels, and DP alt mode is refused. The + * routes are disabled here; the display gate enables them only for a dcpext + * the boot loader handed over, since a USB-C port controller waits for every + * available route. */ -&sep_mbox { - status = "okay"; -}; +&dcpext1 { + apple,connector-type = "USB-C"; + phys = <&atcphy0 PHY_TYPE_DP>, <&atcphy1 PHY_TYPE_DP>; + phy-names = "typec0", "typec1"; + mux-controls = <&atc0_dpxbar 0>, <&atc1_dpxbar 0>, + <&atc0_dpxbar 1>, <&atc0_dpxbar 2>, + <&atc1_dpxbar 1>, <&atc1_dpxbar 2>; + mux-control-names = "typec0", "typec1", + "typec0-dpin0", "typec0-dpin1", + "typec1-dpin0", "typec1-dpin1"; + apple,typec-mux-indices = <4 4>; + apple,typec-dptx-phys = <0 1>; + + status = "okay"; + + typec-routes { + #address-cells = <1>; + #size-cells = <0>; -&spi2 { - status = "okay"; + route@0 { + reg = <0>; + mode-switch; + status = "disabled"; + + port { + dcpext1_typec0: endpoint { + remote-endpoint = <&typec0_dcpext1>; + }; + }; + }; + + route@1 { + reg = <1>; + mode-switch; + status = "disabled"; + + port { + dcpext1_typec1: endpoint { + remote-endpoint = <&typec1_dcpext1>; + }; + }; + }; + }; }; -&mesa { - status = "okay"; - enable-gpios = <&pinctrl_nub 28 GPIO_ACTIVE_HIGH>; - interrupt-parent = <&pinctrl_ap>; - interrupts = <199 IRQ_TYPE_EDGE_RISING>; - spi-cs-setup-delay-ns = <20>; - spi-cs-hold-delay-ns = <20>; +&typec0 { + ports { + port@3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + typec0_dcpext0: endpoint@0 { + reg = <0>; + remote-endpoint = <&dcpext0_typec0>; + }; + + typec0_dcpext1: endpoint@1 { + reg = <1>; + remote-endpoint = <&dcpext1_typec0>; + }; + }; + }; }; -&framebuffer0 { - /delete-property/ power-domains; - panel = <&fb_panel>; +&typec1 { + ports { + port@3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + typec1_dcpext0: endpoint@0 { + reg = <0>; + remote-endpoint = <&dcpext0_typec1>; + }; + + typec1_dcpext1: endpoint@1 { + reg = <1>; + remote-endpoint = <&dcpext1_typec1>; + }; + }; + }; }; -#include "t8132-j713-gpu.dtsi" -#include "t8132-j713-display.dtsi" -#include "t8132-j713-dcpext.dtsi" #include "t8132-j713-atcphy-tunables.dtsi" #include "t8132-j713-usb4.dtsi" #include "t8132-j713-usb4-tunables.dtsi" From 3d353241e59bd0b3149be923cd259f01e7fbe5cd Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:21:29 -0500 Subject: [PATCH 04/17] arm64: dts: apple: t8132: split the boards into SoC, common and family files Lay the T8132 trees out like the M1, M2 and M3 ones: - t8132.dtsi includes the GPU and the internal and external DCPs, which every board now uses. - t8132-jxxx.dtsi takes t8132-board.dtsi, which every board included, and the parts each board repeated: the headphone codec on i2c1 and the ATC0/ATC1 port controllers. Boards only label the connectors. - t8132-laptop.dtsi holds what the J604, J713 and J715 share: the keyboard, trackpad, Touch ID, backlight, speaker shutdown line, headphone card, AOP audio streams and the front camera. - t8132-desktop.dtsi holds what the J773g, J623 and J624 share: the third PCIe port and its Ethernet controller. - t8132-j713-j715.dtsi and t8132-j623-j624.dtsi include those, and each board includes t8132.dtsi and its family file. No output change: every T8132 dtb has the same nodes and properties, and its phandle references point at the same nodes; only node order and phandle numbers move. The T604x dtbs are byte-identical. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t8132-board.dtsi | 357 --------------- arch/arm64/boot/dts/apple/t8132-desktop.dtsi | 28 ++ arch/arm64/boot/dts/apple/t8132-j604.dts | 222 +--------- .../arm64/boot/dts/apple/t8132-j623-j624.dtsi | 127 +----- arch/arm64/boot/dts/apple/t8132-j623.dts | 1 + arch/arm64/boot/dts/apple/t8132-j624.dts | 1 + .../arm64/boot/dts/apple/t8132-j713-j715.dtsi | 177 +------- arch/arm64/boot/dts/apple/t8132-j713.dts | 59 +-- arch/arm64/boot/dts/apple/t8132-j715.dts | 59 +-- arch/arm64/boot/dts/apple/t8132-j773g.dts | 114 +---- arch/arm64/boot/dts/apple/t8132-jxxx.dtsi | 415 ++++++++++++++++++ arch/arm64/boot/dts/apple/t8132-laptop.dtsi | 133 ++++++ arch/arm64/boot/dts/apple/t8132.dtsi | 3 + 13 files changed, 636 insertions(+), 1060 deletions(-) delete mode 100644 arch/arm64/boot/dts/apple/t8132-board.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-desktop.dtsi create mode 100644 arch/arm64/boot/dts/apple/t8132-laptop.dtsi diff --git a/arch/arm64/boot/dts/apple/t8132-board.dtsi b/arch/arm64/boot/dts/apple/t8132-board.dtsi deleted file mode 100644 index 870a05f9617cc..0000000000000 --- a/arch/arm64/boot/dts/apple/t8132-board.dtsi +++ /dev/null @@ -1,357 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT -/* - * SoC-level wiring shared by the full T8132 board trees: the boot loader - * handoffs, the coprocessors, the boot NOR, the radio port, the PMU and - * the first two ATCs. The values match the J713, J604 and J773g ADTs. - * The J713 still carries its own copy in its board file. - * - * Boards provide the Type-C connectors typec0 and typec1 (endpoint labels - * typecN_connector_hs and typecN_connector_ss) and the radio's - * brcm,board-type. - * - * Copyright The Asahi Linux Contributors - */ - -#include -#include -#include - -/ { - aliases { - sep = &sep; - ans = &nvme; - ans-mbox = &ans_mbox; - atcphy0 = &atcphy0; - atcphy1 = &atcphy1; - bluetooth0 = &bluetooth0; - nvram = &nvram; - pmu-primary = &pmic1; - pmp = &pmp; - sart-ans = &sart; - spmi-primary = &nub_spmi; - wifi0 = &wifi0; - }; - - chosen { - linux-enablement-mac,disk-boot; - linux-enablement-mac,dapf-handoff = "/arm-io/aop", "/arm-io/pmp"; - linux-enablement-mac,dapf-power-on-handoff = "/arm-io/pmp"; - }; - - /* - * The boot NOR runs from a PMU rail that is on whenever the SoC is - * and that no OS switches. The ADT gives the flash no supply. - */ - nor_flash_vcc: regulator-nor-flash-vcc { - compatible = "regulator-fixed"; - regulator-name = "nor-flash-vcc"; - regulator-always-on; - }; -}; - -/* - * m1n1 programs the AOP DART's DAPF and reserves the firmware segments and - * the DAPF windows in memory-region when /chosen asks for the AOP's handoff, - * or disables the AOP. - */ -&aop { - status = "okay"; -}; - -&aop_dart { - status = "okay"; -}; - -&aop_mbox { - status = "okay"; - /* A periodic report need not wake the system. */ - apple,hold-rx-in-sleep; -}; - -&admac0 { - status = "okay"; -}; - -&admac1 { - status = "okay"; -}; - -/* These Macs have fans; the SMC owns their cooling. */ -&cpufreq_e { - status = "okay"; -}; - -&cpufreq_p { - status = "okay"; -}; - -&cpuidle { - status = "okay"; -}; - -&qspi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - vcc-supply = <&nor_flash_vcc>; - spi-rx-bus-width = <1>; - spi-tx-bus-width = <1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - nvram: partition@700000 { - label = "nvram"; - /* ADT /arm-io/qspi/spinor/anvram, flash-relative. */ - reg = <0x700000 0x100000>; - }; - }; - }; -}; - -&pmp_dart { - status = "okay"; -}; - -&pmp_report { - status = "okay"; -}; - -&pmp_mbox { - status = "okay"; -}; - -&mcc { - status = "okay"; - apple,boot-dma-devices = <&pmp>; -}; - -&pmc { - status = "okay"; - apple,static-voters = <3>; -}; - -&sep_mbox { - status = "okay"; -}; - -&smc { - status = "okay"; - - smc_hwmon: hwmon { - compatible = "apple,smc-hwmon"; - }; - - rtc { - compatible = "apple,smc-rtc"; - nvmem-cells = <&rtc_offset>; - nvmem-cell-names = "rtc_offset"; - }; - - reboot { - compatible = "apple,t8132-smc-reboot", "apple,smc-reboot"; - nvmem-cells = <&shutdown_flag>, <&boot_stage>, - <&boot_error_count>, <&panic_count>; - nvmem-cell-names = "shutdown_flag", "boot_stage", - "boot_error_count", "panic_count"; - }; -}; - -&smc_mbox { - status = "okay"; -}; - -&nub_spmi { - status = "okay"; - - pmic1: pmic@0 { - compatible = "apple,abbey-pmic", "apple,spmi-nvmem"; - reg = <0x0 SPMI_USID>; /* To be filled by loader */ - - nvmem-layout { - compatible = "fixed-layout"; - #address-cells = <1>; - #size-cells = <1>; - - rtc_offset: rtc-offset@2100 { - reg = <0x2100 0x6>; - }; - - boot_stage: boot-stage@f801 { - reg = <0xf801 0x1>; - }; - - boot_error_count: boot-error-count@f802,0 { - reg = <0xf802 0x1>; - bits = <0 4>; - }; - - panic_count: panic-count@f802,4 { - reg = <0xf802 0x1>; - bits = <4 4>; - }; - - shutdown_flag: shutdown-flag@f80f,3 { - reg = <0xf80f 0x1>; - bits = <3 1>; - }; - }; - }; -}; - -/* The port controllers of ATC0 and ATC1 sit on this SPMI bus. */ -&nub_spmi_a0 { - status = "okay"; -}; - -&atcphy0 { - status = "okay"; - /* Leave the display crossbar at core + 0x4c000 to its own driver. */ - reg = <0x4 0x02a90000 0x0 0x4000>, - <0x4 0x02a84000 0x0 0x4000>, - <0x4 0x03000000 0x0 0x24000>, - <0x4 0x00000000 0x0 0x8000>, - <0x4 0x00020000 0x0 0x4000>, - <0x4 0x03044000 0x0 0x4000>, - <0x4 0x03050000 0x0 0x4000>; - reg-names = "usb2phy", "pipehandler", "core", "axi2af", "lioa", - "fabric", "common-config"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - atcphy0_typec_lanes: endpoint { - remote-endpoint = <&typec0_connector_ss>; - }; - }; - }; -}; - -&dwc3_0_dart_0 { - status = "okay"; -}; - -&dwc3_0_dart_1 { - status = "okay"; -}; - -&dwc3_0 { - status = "okay"; - dr_mode = "host"; - maximum-speed = "super-speed"; - phys = <&atcphy0 PHY_TYPE_USB2>, <&atcphy0 PHY_TYPE_USB3>; - phy-names = "usb2-phy", "usb3-phy"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - dwc3_0_hs: endpoint { - remote-endpoint = <&typec0_connector_hs>; - }; - }; - }; -}; - -&atcphy1 { - status = "okay"; - /* Leave the display crossbar at core + 0x4c000 to its own driver. */ - reg = <0x4 0x0aa90000 0x0 0x4000>, - <0x4 0x0aa84000 0x0 0x4000>, - <0x4 0x0b000000 0x0 0x24000>, - <0x4 0x08000000 0x0 0x8000>, - <0x4 0x08020000 0x0 0x4000>, - <0x4 0x0b044000 0x0 0x4000>, - <0x4 0x0b050000 0x0 0x4000>; - reg-names = "usb2phy", "pipehandler", "core", "axi2af", "lioa", - "fabric", "common-config"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - atcphy1_typec_lanes: endpoint { - remote-endpoint = <&typec1_connector_ss>; - }; - }; - }; -}; - -&dwc3_1_dart_0 { - status = "okay"; -}; - -&dwc3_1_dart_1 { - status = "okay"; -}; - -&dwc3_1 { - status = "okay"; - dr_mode = "host"; - maximum-speed = "super-speed"; - phys = <&atcphy1 PHY_TYPE_USB2>, <&atcphy1 PHY_TYPE_USB3>; - phy-names = "usb2-phy", "usb3-phy"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - dwc3_1_hs: endpoint { - remote-endpoint = <&typec1_connector_hs>; - }; - }; - }; -}; - -/* - * The radio port: m1n1 performs the T8132 controller and PHY - * initialization, Linux adopts the trained link and owns only the radio's - * ordinary streams (ADT mapper-apcie0-wlan and -bt), RID-to-SID routing - * and MSI. Power is the SMC's gP13 (ADT /amfm function-reg_on), reset AP - * GPIO 163 (pci-bridge0 function-perst). - */ -&dart_apcie0 { - status = "okay"; - apple,managed-sids = <1 2>; - apple,dma-range = <0x100 0x00100000 0x0 0x3fe00000>; -}; - -&pcie0 { - status = "okay"; - apple,managed-sids = <1 2>; - iommu-map = <0x100 &dart_apcie0 1 2>; - iommu-map-mask = <0xffff>; -}; - -&port00 { - pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; - reset-gpios = <&pinctrl_ap 163 GPIO_ACTIVE_LOW>; - - bluetooth0: bluetooth@0,1 { - compatible = "pci14e4,5f72"; - reg = <0x10100 0x0 0x0 0x0 0x0>; - /* Per-machine address and calibration supplied by m1n1. */ - local-bd-address = [00 00 00 00 00 00]; - }; - - wifi0: wifi@0,0 { - compatible = "pci14e4,4434"; - reg = <0x10000 0x0 0x0 0x0 0x0>; - local-mac-address = [00 00 00 00 00 00]; - apple,antenna-sku = "XX"; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t8132-desktop.dtsi b/arch/arm64/boot/dts/apple/t8132-desktop.dtsi new file mode 100644 index 0000000000000..1ec8b85b613d5 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-desktop.dtsi @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Apple M4 Mac mini and iMac 24" (2024) + * + * This file contains parts common to the T8132 desktops. + * + * target-type: J623, J624, J773g + * + * Copyright The Asahi Linux Contributors + */ + +#include "t8132-jxxx.dtsi" +#include "t8132-apcie-port2.dtsi" + +/ { + aliases { + ethernet0 = ðernet0; + }; +}; + +/* The Gigabit Ethernet controller (ADT pci-bridge2/lan-1gb). */ +&port02 { + ethernet0: ethernet@0,0 { + reg = <0x20000 0x0 0x0 0x0 0x0>; + /* To be filled by the loader */ + local-mac-address = [00 10 18 00 00 00]; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8132-j604.dts b/arch/arm64/boot/dts/apple/t8132-j604.dts index 745e8c196e8a9..38cedf9d54c83 100644 --- a/arch/arm64/boot/dts/apple/t8132-j604.dts +++ b/arch/arm64/boot/dts/apple/t8132-j604.dts @@ -12,43 +12,15 @@ /dts-v1/; #include "t8132.dtsi" -#include "t8132-jxxx.dtsi" -#include "t8132-board.dtsi" +#include "t8132-laptop.dtsi" #include "t8132-atc23.dtsi" #include "t8132-apcie-port2.dtsi" -#include "t8132-isp.dtsi" -#include "t8132-gpu.dtsi" -#include "t8132-dcp.dtsi" -#include "t8132-dcpext.dtsi" #include -#include #include / { compatible = "apple,j604", "apple,t8132", "apple,arm-platform"; model = "Apple MacBook Pro (14-inch, M4, 2024)"; - chassis-type = "laptop"; - - aliases { - keyboard = &keyboard; - }; - - chosen { - linux-enablement-mac,dapf-handoff = "/arm-io/aop", "/arm-io/mtp", - "/arm-io/pmp"; - }; - - /* - * The speaker amps' shared shutdown line (SDZ, AP GPIO 15, the ADT - * function-reset; low = shutdown). One fixed regulator, the SDZ supply - * of all six, so one amp's fault takes the whole group down. - */ - speaker_sdz: regulator-sn012776-sdz { - compatible = "regulator-fixed"; - regulator-name = "sn012776-sdz"; - gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; /* * The AOP firmware runs the stream: the J616s frame, six playback and @@ -91,43 +63,6 @@ }; }; - /* - * The headphone jack: the AOP audio component's jack back-end (DAI 4) - * to the CS42L84, as a card of its own. - */ - sound_jack: sound-jack { - compatible = "apple,j604-macaudio-jack", "apple,macaudio"; - model = "MacBook Pro J604 Jack"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Headphone Jack"; - - cpu { - sound-dai = <&aop_audio 4>; - }; - - codec { - sound-dai = <&jack_codec>; - }; - }; - }; - - led-controller { - compatible = "pwm-leds"; - - led-0 { - pwms = <&fpwm1 0 40000>; - label = "kbd_backlight"; - function = LED_FUNCTION_KBD_BACKLIGHT; - color = ; - max-brightness = <255>; - default-state = "keep"; - }; - }; - /* * Physical size of the firmware framebuffer's 3024x1890 area below * the notch (14.2" panel, 254 ppi), so simpledrm reports the real DPI. @@ -139,17 +74,12 @@ }; }; -&framebuffer0 { - panel = <&fb_panel>; +&sound_jack { + compatible = "apple,j604-macaudio-jack", "apple,macaudio"; + model = "MacBook Pro J604 Jack"; }; &aop_audio { - /* - * The microphones on LEAP; the speakers and their sense on base-ns TX0 - * and RX0, the jack on TX2 and RX2 (ADT iop-audio-controller). - */ - dmas = <&admac0 1>, <&admac1 0>, <&admac1 1>, <&admac1 4>, <&admac1 5>; - dma-names = "dma", "spkr", "sense", "cout", "cin"; apple,chassis-name = "J604"; apple,machine-kind = "MacBook Pro"; }; @@ -249,106 +179,15 @@ }; }; -/* - * The CS42L84 headphone codec (ADT /arm-io/i2c1/audio-codec-output at 0x4b). - * Its reset line is nub GPIO 17, driven high to run the codec; its interrupt - * is AP GPIO 98, level low. The AOP firmware runs the jack's stream. - */ -&i2c1 { - status = "okay"; - - jack_codec: codec@4b { - compatible = "cirrus,cs42l84"; - reg = <0x4b>; - reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; - sound-name-prefix = "Jack"; - }; +&typec0 { + label = "USB-C Left Front"; }; -&fpwm1 { - status = "okay"; -}; - -/* - * The USB-C port controllers (ADT nub-spmi-a0 hpm0 and hpm1, nub-spmi-a1 - * hpm3). hpm5, the MagSafe port's, is not wired. - */ -&nub_spmi_a0 { - hpm1: usb-pd@a { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xa SPMI_USID>; - interrupts = <37 IRQ_TYPE_EDGE_RISING>, - <43 IRQ_TYPE_EDGE_RISING>, - <45 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec1: connector { - compatible = "usb-c-connector"; - label = "USB-C Left Rear"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec1_connector_hs: endpoint { - remote-endpoint = <&dwc3_1_hs>; - }; - }; - - port@1 { - reg = <1>; - typec1_connector_ss: endpoint { - remote-endpoint = <&atcphy1_typec_lanes>; - }; - }; - }; - }; - }; - - hpm0: usb-pd@c { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xc SPMI_USID>; - interrupts = <11 IRQ_TYPE_EDGE_RISING>, - <17 IRQ_TYPE_EDGE_RISING>, - <19 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec0: connector { - compatible = "usb-c-connector"; - label = "USB-C Left Front"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec0_connector_hs: endpoint { - remote-endpoint = <&dwc3_0_hs>; - }; - }; - - port@1 { - reg = <1>; - typec0_connector_ss: endpoint { - remote-endpoint = <&atcphy0_typec_lanes>; - }; - }; - }; - }; - }; +&typec1 { + label = "USB-C Left Rear"; }; +/* hpm3 is ATC3's port controller; hpm5, the MagSafe port's, is not wired. */ &nub_spmi_a1 { status = "okay"; @@ -456,56 +295,13 @@ pwren-gpios = <&smc_gpio 0x19 GPIO_ACTIVE_HIGH>; }; -&mtp { - status = "okay"; -}; - -&mtp_mbox { - status = "okay"; -}; - -&mtp_dart { - status = "okay"; -}; - -&mtp_dockchannel { - status = "okay"; -}; - -/* ADT function-afe-reset gP1c and function-stm-reset gP1d. */ &mtp_hid { - apple,afe-reset-gpios = <&smc_gpio 28 GPIO_ACTIVE_LOW>; - apple,stm-reset-gpios = <&smc_gpio 29 GPIO_ACTIVE_LOW>; - multi-touch { firmware-name = "apple/tpmtfw-j604.bin"; - apple,power-method = <2>; - }; - - keyboard: keyboard { - hid-country-code = <0>; - apple,keyboard-layout-id = <0>; - }; - - stm { }; }; -/* - * Mesa fingerprint sensor on spi2 (ADT /arm-io/spi2/mesa): power on NUB - * GPIO 28, active high; data-ready on AP GPIO 199. Native chip select only. - */ -&spi2 { - status = "okay"; -}; - &mesa { - status = "okay"; - enable-gpios = <&pinctrl_nub 28 GPIO_ACTIVE_HIGH>; - interrupt-parent = <&pinctrl_ap>; - interrupts = <199 IRQ_TYPE_EDGE_RISING>; - spi-cs-setup-delay-ns = <20>; - spi-cs-hold-delay-ns = <20>; /* * Per-device factory data from this Mac's own iBoot system container: * the calibration, and the signed root key the nonce session loads. diff --git a/arch/arm64/boot/dts/apple/t8132-j623-j624.dtsi b/arch/arm64/boot/dts/apple/t8132-j623-j624.dtsi index b99717b48077b..638c871acf30a 100644 --- a/arch/arm64/boot/dts/apple/t8132-j623-j624.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j623-j624.dtsi @@ -11,24 +11,12 @@ * Copyright The Asahi Linux Contributors */ -#include "t8132.dtsi" -#include "t8132-jxxx.dtsi" -#include "t8132-board.dtsi" -#include "t8132-apcie-port2.dtsi" +#include "t8132-desktop.dtsi" #include "t8132-isp.dtsi" -#include "t8132-gpu.dtsi" -#include "t8132-dcp.dtsi" -#include "t8132-dcpext.dtsi" -#include -#include / { chassis-type = "all-in-one"; - aliases { - ethernet0 = ðernet0; - }; - /* * The headphone jack: the AOP audio component's jack back-end (DAI 4) * to the CS42L84, as a card of its own. The speakers are not @@ -74,101 +62,18 @@ apple,machine-kind = "iMac"; }; -/* - * The CS42L84 headphone codec at i2c1 0x4b: reset on nub GPIO 17, - * interrupt on AP GPIO 98 (guessed, as on every M4 ADT), tip sense - * inverted (guessed, as on the M3 iMacs). - */ -&i2c1 { - status = "okay"; - - jack_codec: codec@4b { - compatible = "cirrus,cs42l84"; - reg = <0x4b>; - reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; - cirrus,ts-inv = <1>; - sound-name-prefix = "Jack"; - }; +/* The headphone codec's tip sense is inverted (guessed, as on the M3 iMacs). */ +&jack_codec { + cirrus,ts-inv = <1>; }; -/* - * The port controllers of ATC1 and ATC0 at nub-spmi-a0 0xa and 0xc - * (guessed, as on every M4 ADT). - */ -&nub_spmi_a0 { - hpm1: usb-pd@a { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xa SPMI_USID>; - interrupts = <37 IRQ_TYPE_EDGE_RISING>, - <43 IRQ_TYPE_EDGE_RISING>, - <45 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec1: connector { - compatible = "usb-c-connector"; - label = "USB-C Back 2"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec1_connector_hs: endpoint { - remote-endpoint = <&dwc3_1_hs>; - }; - }; - - port@1 { - reg = <1>; - typec1_connector_ss: endpoint { - remote-endpoint = <&atcphy1_typec_lanes>; - }; - }; - }; - }; - }; - - hpm0: usb-pd@c { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xc SPMI_USID>; - interrupts = <11 IRQ_TYPE_EDGE_RISING>, - <17 IRQ_TYPE_EDGE_RISING>, - <19 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec0: connector { - compatible = "usb-c-connector"; - label = "USB-C Back 1"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec0_connector_hs: endpoint { - remote-endpoint = <&dwc3_0_hs>; - }; - }; +/* The port controllers' places are guessed, as on every M4 ADT. */ +&typec0 { + label = "USB-C Back 1"; +}; - port@1 { - reg = <1>; - typec0_connector_ss: endpoint { - remote-endpoint = <&atcphy0_typec_lanes>; - }; - }; - }; - }; - }; +&typec1 { + label = "USB-C Back 2"; }; /* @@ -176,17 +81,5 @@ * which is not known for these boards; the boot loader supplies it. */ -/* - * The Gigabit Ethernet controller in the power adapter, on the third - * PCIe port as on the Mac mini (guessed). - */ -&port02 { - ethernet0: ethernet@0,0 { - reg = <0x20000 0x0 0x0 0x0 0x0>; - /* To be filled by the loader */ - local-mac-address = [00 10 18 00 00 00]; - }; -}; - #include "hwmon-common.dtsi" #include "hwmon-fan-dual.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j623.dts b/arch/arm64/boot/dts/apple/t8132-j623.dts index 8403219e8abe8..ae232af299d11 100644 --- a/arch/arm64/boot/dts/apple/t8132-j623.dts +++ b/arch/arm64/boot/dts/apple/t8132-j623.dts @@ -9,6 +9,7 @@ /dts-v1/; +#include "t8132.dtsi" #include "t8132-j623-j624.dtsi" / { diff --git a/arch/arm64/boot/dts/apple/t8132-j624.dts b/arch/arm64/boot/dts/apple/t8132-j624.dts index 05a7fac274dbb..4df3488d2a77a 100644 --- a/arch/arm64/boot/dts/apple/t8132-j624.dts +++ b/arch/arm64/boot/dts/apple/t8132-j624.dts @@ -9,6 +9,7 @@ /dts-v1/; +#include "t8132.dtsi" #include "t8132-j623-j624.dtsi" #include "t8132-atc23.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi index 85d3e20c3dab9..e8205102f27e8 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi @@ -9,39 +9,13 @@ * Copyright The Asahi Linux Contributors */ -#include "t8132-board.dtsi" -#include "t8132-isp.dtsi" -#include "t8132-gpu.dtsi" -#include "t8132-dcp.dtsi" -#include "t8132-dcpext.dtsi" +#include "t8132-laptop.dtsi" #include "t8132-j713-pmgr.dtsi" -#include -#include #include -#include / { aliases { disp0_piodma = &disp0_piodma; - keyboard = &keyboard; - }; - - chosen { - linux-enablement-mac,dapf-handoff = "/arm-io/aop", "/arm-io/mtp", - "/arm-io/pmp"; - }; - - led-controller { - compatible = "pwm-leds"; - - led-0 { - pwms = <&fpwm1 0 40000>; - label = "kbd_backlight"; - function = LED_FUNCTION_KBD_BACKLIGHT; - color = ; - max-brightness = <255>; - default-state = "keep"; - }; }; }; @@ -72,104 +46,14 @@ &framebuffer0 { /delete-property/ power-domains; - panel = <&fb_panel>; -}; - -&aop_audio { - /* - * Microphones on LEAP; speakers and their sense on TX0/RX0; the jack - * on TX2/RX2. - */ - dmas = <&admac0 1>, <&admac1 0>, <&admac1 1>, <&admac1 4>, <&admac1 5>; - dma-names = "dma", "spkr", "sense", "cout", "cin"; }; -/* CS42L84 headphone codec: reset on nub GPIO 17, IRQ on AP GPIO 98. */ -&i2c1 { - status = "okay"; - - jack_codec: codec@4b { - compatible = "cirrus,cs42l84"; - reg = <0x4b>; - reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; - sound-name-prefix = "Jack"; - }; +&typec0 { + label = "USB-C native client"; }; -&nub_spmi_a0 { - hpm1: usb-pd@a { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xa SPMI_USID>; - interrupts = <37 IRQ_TYPE_EDGE_RISING>, - <43 IRQ_TYPE_EDGE_RISING>, - <45 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec1: connector { - compatible = "usb-c-connector"; - label = "USB-C MagSafe-adjacent"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec1_connector_hs: endpoint { - remote-endpoint = <&dwc3_1_hs>; - }; - }; - - port@1 { - reg = <1>; - typec1_connector_ss: endpoint { - remote-endpoint = <&atcphy1_typec_lanes>; - }; - }; - }; - }; - }; - - hpm0: usb-pd@c { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xc SPMI_USID>; - interrupts = <11 IRQ_TYPE_EDGE_RISING>, - <17 IRQ_TYPE_EDGE_RISING>, - <19 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec0: connector { - compatible = "usb-c-connector"; - label = "USB-C native client"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec0_connector_hs: endpoint { - remote-endpoint = <&dwc3_0_hs>; - }; - }; - - port@1 { - reg = <1>; - typec0_connector_ss: endpoint { - remote-endpoint = <&atcphy0_typec_lanes>; - }; - }; - }; - }; - }; +&typec1 { + label = "USB-C MagSafe-adjacent"; }; /* The radio's firmware island: the J713's here, the J715 overrides it. */ @@ -181,10 +65,6 @@ brcm,board-type = "apple,garden"; }; -&fpwm1 { - status = "okay"; -}; - /* An external pipe's PMC enables follow its SYS state, before its FE. */ &ps_dispext0_fe { power-domains = <&ps_dispext0_sys>, <&pmc_dispext0>; @@ -252,53 +132,6 @@ }; }; -&mtp { - status = "okay"; -}; - -&mtp_mbox { - status = "okay"; -}; - -&mtp_dart { - status = "okay"; -}; - -&mtp_dockchannel { - status = "okay"; -}; - -&mtp_hid { - apple,afe-reset-gpios = <&smc_gpio 28 GPIO_ACTIVE_LOW>; - apple,stm-reset-gpios = <&smc_gpio 29 GPIO_ACTIVE_LOW>; - - multi-touch { - apple,power-method = <2>; - }; - - keyboard: keyboard { - hid-country-code = <0>; - apple,keyboard-layout-id = <0>; - }; - - stm { - }; -}; - -/* Mesa fingerprint sensor: power on nub GPIO 28, data-ready on AP GPIO 199. */ -&spi2 { - status = "okay"; -}; - -&mesa { - enable-gpios = <&pinctrl_nub 28 GPIO_ACTIVE_HIGH>; - interrupt-parent = <&pinctrl_ap>; - interrupts = <199 IRQ_TYPE_EDGE_RISING>; - spi-cs-setup-delay-ns = <20>; - spi-cs-hold-delay-ns = <20>; - status = "okay"; -}; - /* GPU: the outer TVM gate is the parent of the GFX domain. */ &gfx_tvm { status = "okay"; diff --git a/arch/arm64/boot/dts/apple/t8132-j713.dts b/arch/arm64/boot/dts/apple/t8132-j713.dts index eaa579f9efd1e..b4a0813268ebf 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713.dts +++ b/arch/arm64/boot/dts/apple/t8132-j713.dts @@ -10,25 +10,12 @@ /dts-v1/; #include "t8132.dtsi" -#include "t8132-jxxx.dtsi" +#include "t8132-j713-j715.dtsi" #include / { compatible = "apple,j713", "apple,t8132", "apple,arm-platform"; model = "Apple MacBook Air (13-inch, M4, 2025)"; - chassis-type = "laptop"; - - /* - * The speaker amps' shared shutdown line (SDZ, AP GPIO 15, the ADT - * function-reset; low = shutdown). One fixed regulator, the SDZ supply - * of all four, so one amp's fault takes the whole group down. - */ - speaker_sdz: regulator-sn012776-sdz { - compatible = "regulator-fixed"; - regulator-name = "sn012776-sdz"; - gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; /* * The AOP firmware runs the stream (MCA cluster 0, one serializer for @@ -65,38 +52,27 @@ }; /* - * The headphone jack: the AOP audio component's jack back-end (DAI 4) - * to the CS42L84, as a card of its own. + * Physical size of the firmware framebuffer's 2560x1600 area below the + * notch (13.6" panel, 224 ppi), so simpledrm reports the real DPI. */ - sound_jack: sound-jack { - compatible = "apple,j713-macaudio-jack", "apple,macaudio"; - model = "MacBook Air J713 Jack"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Headphone Jack"; - - cpu { - sound-dai = <&aop_audio 4>; - }; - - codec { - sound-dai = <&jack_codec>; - }; - }; + fb_panel: panel { + width-mm = <290>; + height-mm = <181>; + status = "disabled"; }; }; +&sound_jack { + compatible = "apple,j713-macaudio-jack", "apple,macaudio"; + model = "MacBook Air J713 Jack"; +}; + &mtp_hid { multi-touch { firmware-name = "apple/tpmtfw-j713.bin"; }; }; -#include "t8132-j713-j715.dtsi" - &aop_audio { apple,chassis-name = "J713"; apple,machine-kind = "MacBook Air"; @@ -174,14 +150,3 @@ firmware-name = "apple/mesacal-j713.bin", "apple/msrk-j713.bin"; }; -/ { - /* - * Physical size of the firmware framebuffer's 2560x1600 area below the - * notch (13.6" panel, 224 ppi), so simpledrm reports the real DPI. - */ - fb_panel: panel { - width-mm = <290>; - height-mm = <181>; - status = "disabled"; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t8132-j715.dts b/arch/arm64/boot/dts/apple/t8132-j715.dts index 6662e95eebf95..3d02f4048027a 100644 --- a/arch/arm64/boot/dts/apple/t8132-j715.dts +++ b/arch/arm64/boot/dts/apple/t8132-j715.dts @@ -13,25 +13,12 @@ /dts-v1/; #include "t8132.dtsi" -#include "t8132-jxxx.dtsi" +#include "t8132-j713-j715.dtsi" #include / { compatible = "apple,j715", "apple,t8132", "apple,arm-platform"; model = "Apple MacBook Air (15-inch, M4, 2025)"; - chassis-type = "laptop"; - - /* - * The speaker amps' shared shutdown line (SDZ, AP GPIO 15, the ADT - * function-reset; low = shutdown). One fixed regulator, the SDZ supply - * of all six, so one amp's fault takes the whole group down. - */ - speaker_sdz: regulator-sn012776-sdz { - compatible = "regulator-fixed"; - regulator-name = "sn012776-sdz"; - gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; /* * The AOP firmware runs the stream (MCA cluster 0, one serializer for @@ -70,38 +57,27 @@ }; /* - * The headphone jack: the AOP audio component's jack back-end (DAI 4) - * to the CS42L84, as a card of its own. + * Physical size of the firmware framebuffer's 2880x1800 area below the + * notch (15.3" panel, 224 ppi), so simpledrm reports the real DPI. */ - sound_jack: sound-jack { - compatible = "apple,j715-macaudio-jack", "apple,macaudio"; - model = "MacBook Air J715 Jack"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Headphone Jack"; - - cpu { - sound-dai = <&aop_audio 4>; - }; - - codec { - sound-dai = <&jack_codec>; - }; - }; + fb_panel: panel { + width-mm = <327>; + height-mm = <204>; + status = "disabled"; }; }; +&sound_jack { + compatible = "apple,j715-macaudio-jack", "apple,macaudio"; + model = "MacBook Air J715 Jack"; +}; + &mtp_hid { multi-touch { firmware-name = "apple/tpmtfw-j715.bin"; }; }; -#include "t8132-j713-j715.dtsi" - /* The radio module's firmware island, from the ADT's module-instance. */ &wifi0 { brcm,board-type = "apple,kos"; @@ -277,14 +253,3 @@ apple,panel-height-mm = <211>; }; -/ { - /* - * Physical size of the firmware framebuffer's 2880x1800 area below the - * notch (15.3" panel, 224 ppi), so simpledrm reports the real DPI. - */ - fb_panel: panel { - width-mm = <327>; - height-mm = <204>; - status = "disabled"; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t8132-j773g.dts b/arch/arm64/boot/dts/apple/t8132-j773g.dts index 82d8f0c23c923..1310ddfc6f88e 100644 --- a/arch/arm64/boot/dts/apple/t8132-j773g.dts +++ b/arch/arm64/boot/dts/apple/t8132-j773g.dts @@ -12,13 +12,8 @@ /dts-v1/; #include "t8132.dtsi" -#include "t8132-jxxx.dtsi" -#include "t8132-board.dtsi" +#include "t8132-desktop.dtsi" #include "t8132-atc23.dtsi" -#include "t8132-apcie-port2.dtsi" -#include "t8132-gpu.dtsi" -#include "t8132-dcp.dtsi" -#include "t8132-dcpext.dtsi" #include #include @@ -27,10 +22,6 @@ model = "Apple Mac mini (M4, 2024)"; chassis-type = "desktop"; - aliases { - ethernet0 = ðernet0; - }; - /* * The speaker amp's shutdown line (SDZ, AP GPIO 15, the ADT * function-reset; low = shutdown). @@ -83,25 +74,15 @@ }; }; -/* - * The CS42L84 headphone codec (ADT /arm-io/i2c1/audio-codec-output at 0x4b). - * Its reset line is nub GPIO 17, driven high to run the codec; its interrupt - * is AP GPIO 98, level low. - */ -&i2c1 { - status = "okay"; +&typec0 { + label = "USB-C Back Middle"; +}; - jack_codec: codec@4b { - compatible = "cirrus,cs42l84"; - reg = <0x4b>; - reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; - sound-name-prefix = "Jack"; - }; +&typec1 { + label = "USB-C Back Left"; }; -/* The rear USB-C port controllers (ADT nub-spmi-a0 hpm0, hpm1 and hpm3). */ +/* ATC3's port controller (ADT nub-spmi-a0 hpm3). */ &nub_spmi_a0 { hpm3: usb-pd@8 { compatible = "apple,t8132-sn201202x", "apple,sn201202x"; @@ -138,78 +119,6 @@ }; }; }; - - hpm1: usb-pd@a { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xa SPMI_USID>; - interrupts = <37 IRQ_TYPE_EDGE_RISING>, - <43 IRQ_TYPE_EDGE_RISING>, - <45 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec1: connector { - compatible = "usb-c-connector"; - label = "USB-C Back Left"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec1_connector_hs: endpoint { - remote-endpoint = <&dwc3_1_hs>; - }; - }; - - port@1 { - reg = <1>; - typec1_connector_ss: endpoint { - remote-endpoint = <&atcphy1_typec_lanes>; - }; - }; - }; - }; - }; - - hpm0: usb-pd@c { - compatible = "apple,t8132-sn201202x", "apple,sn201202x"; - reg = <0xc SPMI_USID>; - interrupts = <11 IRQ_TYPE_EDGE_RISING>, - <17 IRQ_TYPE_EDGE_RISING>, - <19 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "sleep", "wake"; - wakeup-source; - - typec0: connector { - compatible = "usb-c-connector"; - label = "USB-C Back Middle"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec0_connector_hs: endpoint { - remote-endpoint = <&dwc3_0_hs>; - }; - }; - - port@1 { - reg = <1>; - typec0_connector_ss: endpoint { - remote-endpoint = <&atcphy0_typec_lanes>; - }; - }; - }; - }; - }; }; &atcphy3 { @@ -287,14 +196,5 @@ brcm,board-type = "apple,sakhalin"; }; -/* The Gigabit Ethernet controller (ADT pci-bridge2/lan-1gb). */ -&port02 { - ethernet0: ethernet@0,0 { - reg = <0x20000 0x0 0x0 0x0 0x0>; - /* To be filled by the loader */ - local-mac-address = [00 10 18 00 00 00]; - }; -}; - #include "hwmon-common.dtsi" #include "hwmon-mini.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8132-jxxx.dtsi index 9882ea3f85e61..772a8b8656203 100644 --- a/arch/arm64/boot/dts/apple/t8132-jxxx.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-jxxx.dtsi @@ -9,9 +9,25 @@ * Copyright The Asahi Linux Contributors */ +#include +#include +#include + / { aliases { serial0 = &serial0; + sep = &sep; + ans = &nvme; + ans-mbox = &ans_mbox; + atcphy0 = &atcphy0; + atcphy1 = &atcphy1; + bluetooth0 = &bluetooth0; + nvram = &nvram; + pmu-primary = &pmic1; + pmp = &pmp; + sart-ans = &sart; + spmi-primary = &nub_spmi; + wifi0 = &wifi0; }; chosen { @@ -21,6 +37,10 @@ stdout-path = "serial0"; + linux-enablement-mac,disk-boot; + linux-enablement-mac,dapf-handoff = "/arm-io/aop", "/arm-io/pmp"; + linux-enablement-mac,dapf-power-on-handoff = "/arm-io/pmp"; + framebuffer0: framebuffer@0 { compatible = "apple,simple-framebuffer", "simple-framebuffer"; reg = <0 0 0 0>; /* To be filled by loader */ @@ -41,8 +61,403 @@ device_type = "memory"; reg = <0x8 0 0x2 0>; /* To be filled by loader */ }; + + /* The boot NOR's PMU rail is always on; the ADT gives it no supply. */ + nor_flash_vcc: regulator-nor-flash-vcc { + compatible = "regulator-fixed"; + regulator-name = "nor-flash-vcc"; + regulator-always-on; + }; }; &serial0 { status = "okay"; }; + +/* + * m1n1 programs the AOP DART's DAPF and reserves its firmware and DAPF + * windows when /chosen asks for the handoff, or disables the AOP. + */ +&aop { + status = "okay"; +}; + +&aop_dart { + status = "okay"; +}; + +&aop_mbox { + /* A periodic report need not wake the system. */ + apple,hold-rx-in-sleep; + status = "okay"; +}; + +&admac0 { + status = "okay"; +}; + +&admac1 { + status = "okay"; +}; + +&cpufreq_e { + status = "okay"; +}; + +&cpufreq_p { + status = "okay"; +}; + +&cpuidle { + status = "okay"; +}; + +/* CS42L84 headphone codec: reset on nub GPIO 17, IRQ on AP GPIO 98. */ +&i2c1 { + status = "okay"; + + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 17 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl_ap 98 IRQ_TYPE_LEVEL_LOW>; + sound-name-prefix = "Jack"; + }; +}; + +&qspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + vcc-supply = <&nor_flash_vcc>; + spi-rx-bus-width = <1>; + spi-tx-bus-width = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + nvram: partition@700000 { + label = "nvram"; + /* ADT /arm-io/qspi/spinor/anvram, flash-relative. */ + reg = <0x700000 0x100000>; + }; + }; + }; +}; + +&pmp_dart { + status = "okay"; +}; + +&pmp_report { + status = "okay"; +}; + +&pmp_mbox { + status = "okay"; +}; + +&mcc { + apple,boot-dma-devices = <&pmp>; + status = "okay"; +}; + +&pmc { + apple,static-voters = <3>; + status = "okay"; +}; + +&sep_mbox { + status = "okay"; +}; + +&smc { + status = "okay"; + + smc_hwmon: hwmon { + compatible = "apple,smc-hwmon"; + }; + + rtc { + compatible = "apple,smc-rtc"; + nvmem-cells = <&rtc_offset>; + nvmem-cell-names = "rtc_offset"; + }; + + reboot { + compatible = "apple,t8132-smc-reboot", "apple,smc-reboot"; + nvmem-cells = <&shutdown_flag>, <&boot_stage>, + <&boot_error_count>, <&panic_count>; + nvmem-cell-names = "shutdown_flag", "boot_stage", + "boot_error_count", "panic_count"; + }; +}; + +&smc_mbox { + status = "okay"; +}; + +&nub_spmi { + status = "okay"; + + pmic1: pmic@0 { + compatible = "apple,abbey-pmic", "apple,spmi-nvmem"; + reg = <0x0 SPMI_USID>; /* To be filled by loader */ + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + rtc_offset: rtc-offset@2100 { + reg = <0x2100 0x6>; + }; + + boot_stage: boot-stage@f801 { + reg = <0xf801 0x1>; + }; + + boot_error_count: boot-error-count@f802,0 { + reg = <0xf802 0x1>; + bits = <0 4>; + }; + + panic_count: panic-count@f802,4 { + reg = <0xf802 0x1>; + bits = <4 4>; + }; + + shutdown_flag: shutdown-flag@f80f,3 { + reg = <0xf80f 0x1>; + bits = <3 1>; + }; + }; + }; +}; + +/* ATC0 and ATC1's port controllers. Boards label the connectors. */ +&nub_spmi_a0 { + status = "okay"; + + hpm1: usb-pd@a { + compatible = "apple,t8132-sn201202x", "apple,sn201202x"; + reg = <0xa SPMI_USID>; + interrupts = <37 IRQ_TYPE_EDGE_RISING>, + <43 IRQ_TYPE_EDGE_RISING>, + <45 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "irq", "sleep", "wake"; + wakeup-source; + + typec1: connector { + compatible = "usb-c-connector"; + power-role = "dual"; + data-role = "dual"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + typec1_connector_hs: endpoint { + remote-endpoint = <&dwc3_1_hs>; + }; + }; + + port@1 { + reg = <1>; + typec1_connector_ss: endpoint { + remote-endpoint = <&atcphy1_typec_lanes>; + }; + }; + }; + }; + }; + + hpm0: usb-pd@c { + compatible = "apple,t8132-sn201202x", "apple,sn201202x"; + reg = <0xc SPMI_USID>; + interrupts = <11 IRQ_TYPE_EDGE_RISING>, + <17 IRQ_TYPE_EDGE_RISING>, + <19 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "irq", "sleep", "wake"; + wakeup-source; + + typec0: connector { + compatible = "usb-c-connector"; + power-role = "dual"; + data-role = "dual"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + typec0_connector_hs: endpoint { + remote-endpoint = <&dwc3_0_hs>; + }; + }; + + port@1 { + reg = <1>; + typec0_connector_ss: endpoint { + remote-endpoint = <&atcphy0_typec_lanes>; + }; + }; + }; + }; + }; +}; + +&atcphy0 { + /* Leave the display crossbar at core + 0x4c000 to its own driver. */ + reg = <0x4 0x02a90000 0x0 0x4000>, + <0x4 0x02a84000 0x0 0x4000>, + <0x4 0x03000000 0x0 0x24000>, + <0x4 0x00000000 0x0 0x8000>, + <0x4 0x00020000 0x0 0x4000>, + <0x4 0x03044000 0x0 0x4000>, + <0x4 0x03050000 0x0 0x4000>; + reg-names = "usb2phy", "pipehandler", "core", "axi2af", "lioa", + "fabric", "common-config"; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + atcphy0_typec_lanes: endpoint { + remote-endpoint = <&typec0_connector_ss>; + }; + }; + }; +}; + +&dwc3_0_dart_0 { + status = "okay"; +}; + +&dwc3_0_dart_1 { + status = "okay"; +}; + +&dwc3_0 { + dr_mode = "host"; + maximum-speed = "super-speed"; + phys = <&atcphy0 PHY_TYPE_USB2>, <&atcphy0 PHY_TYPE_USB3>; + phy-names = "usb2-phy", "usb3-phy"; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dwc3_0_hs: endpoint { + remote-endpoint = <&typec0_connector_hs>; + }; + }; + }; +}; + +&atcphy1 { + /* Leave the display crossbar at core + 0x4c000 to its own driver. */ + reg = <0x4 0x0aa90000 0x0 0x4000>, + <0x4 0x0aa84000 0x0 0x4000>, + <0x4 0x0b000000 0x0 0x24000>, + <0x4 0x08000000 0x0 0x8000>, + <0x4 0x08020000 0x0 0x4000>, + <0x4 0x0b044000 0x0 0x4000>, + <0x4 0x0b050000 0x0 0x4000>; + reg-names = "usb2phy", "pipehandler", "core", "axi2af", "lioa", + "fabric", "common-config"; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + atcphy1_typec_lanes: endpoint { + remote-endpoint = <&typec1_connector_ss>; + }; + }; + }; +}; + +&dwc3_1_dart_0 { + status = "okay"; +}; + +&dwc3_1_dart_1 { + status = "okay"; +}; + +&dwc3_1 { + dr_mode = "host"; + maximum-speed = "super-speed"; + phys = <&atcphy1 PHY_TYPE_USB2>, <&atcphy1 PHY_TYPE_USB3>; + phy-names = "usb2-phy", "usb3-phy"; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dwc3_1_hs: endpoint { + remote-endpoint = <&typec1_connector_hs>; + }; + }; + }; +}; + +/* + * The radio port. m1n1 trains the link; Linux owns only the radio's + * streams (ADT mapper-apcie0-wlan and -bt), RID-to-SID routing and MSI. + * Power is the SMC's gP13, reset AP GPIO 163. + */ +&dart_apcie0 { + apple,managed-sids = <1 2>; + apple,dma-range = <0x100 0x00100000 0x0 0x3fe00000>; + status = "okay"; +}; + +&pcie0 { + apple,managed-sids = <1 2>; + iommu-map = <0x100 &dart_apcie0 1 2>; + iommu-map-mask = <0xffff>; + status = "okay"; +}; + +&port00 { + pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pinctrl_ap 163 GPIO_ACTIVE_LOW>; + + /* brcm,board-type is "apple," + the ADT wlan module-instance. */ + bluetooth0: bluetooth@0,1 { + compatible = "pci14e4,5f72"; + reg = <0x10100 0x0 0x0 0x0 0x0>; + /* Per-machine address and calibration supplied by m1n1. */ + local-bd-address = [00 00 00 00 00 00]; + }; + + wifi0: wifi@0,0 { + compatible = "pci14e4,4434"; + reg = <0x10000 0x0 0x0 0x0 0x0>; + local-mac-address = [00 00 00 00 00 00]; + apple,antenna-sku = "XX"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8132-laptop.dtsi b/arch/arm64/boot/dts/apple/t8132-laptop.dtsi new file mode 100644 index 0000000000000..e056ba40f5a28 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t8132-laptop.dtsi @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Apple M4 MacBook Air and MacBook Pro (2024/2025) + * + * This file contains parts common to the T8132 laptops. + * + * target-type: J604, J713, J715 + * + * Copyright The Asahi Linux Contributors + */ + +#include "t8132-jxxx.dtsi" +#include "t8132-isp.dtsi" +#include +#include + +/ { + chassis-type = "laptop"; + + aliases { + keyboard = &keyboard; + }; + + chosen { + linux-enablement-mac,dapf-handoff = "/arm-io/aop", "/arm-io/mtp", + "/arm-io/pmp"; + }; + + /* + * The speaker amps' shared shutdown line (SDZ, AP GPIO 15, low = + * shutdown): one amp's fault takes the whole group down. + */ + speaker_sdz: regulator-sn012776-sdz { + compatible = "regulator-fixed"; + regulator-name = "sn012776-sdz"; + gpios = <&pinctrl_ap 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + /* The headphone jack: the AOP audio jack back-end (DAI 4) to the CS42L84. */ + sound_jack: sound-jack { + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + link-name = "Headphone Jack"; + + cpu { + sound-dai = <&aop_audio 4>; + }; + + codec { + sound-dai = <&jack_codec>; + }; + }; + }; + + led-controller { + compatible = "pwm-leds"; + + led-0 { + pwms = <&fpwm1 0 40000>; + label = "kbd_backlight"; + function = LED_FUNCTION_KBD_BACKLIGHT; + color = ; + max-brightness = <255>; + default-state = "keep"; + }; + }; +}; + +&framebuffer0 { + panel = <&fb_panel>; +}; + +&aop_audio { + /* Microphones on LEAP; speakers and sense on TX0/RX0; the jack on TX2/RX2. */ + dmas = <&admac0 1>, <&admac1 0>, <&admac1 1>, <&admac1 4>, <&admac1 5>; + dma-names = "dma", "spkr", "sense", "cout", "cin"; +}; + +&fpwm1 { + status = "okay"; +}; + +&mtp { + status = "okay"; +}; + +&mtp_mbox { + status = "okay"; +}; + +&mtp_dart { + status = "okay"; +}; + +&mtp_dockchannel { + status = "okay"; +}; + +/* ADT function-afe-reset gP1c and function-stm-reset gP1d. */ +&mtp_hid { + apple,afe-reset-gpios = <&smc_gpio 28 GPIO_ACTIVE_LOW>; + apple,stm-reset-gpios = <&smc_gpio 29 GPIO_ACTIVE_LOW>; + + multi-touch { + apple,power-method = <2>; + }; + + keyboard: keyboard { + hid-country-code = <0>; + apple,keyboard-layout-id = <0>; + }; + + stm { + }; +}; + +/* Mesa fingerprint sensor: power on nub GPIO 28, data-ready on AP GPIO 199. */ +&spi2 { + status = "okay"; +}; + +&mesa { + enable-gpios = <&pinctrl_nub 28 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&pinctrl_ap>; + interrupts = <199 IRQ_TYPE_EDGE_RISING>; + spi-cs-setup-delay-ns = <20>; + spi-cs-hold-delay-ns = <20>; + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index 6ee608983784e..5d636014bea45 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -1327,3 +1327,6 @@ }; #include "t8132-memory.dtsi" +#include "t8132-gpu.dtsi" +#include "t8132-dcp.dtsi" +#include "t8132-dcpext.dtsi" From 5aa0279e54ddc0adfd973face63ceab9b7cb3059 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:23:36 -0500 Subject: [PATCH 05/17] arm64: dts: apple: t8132: describe the PCIe-C tunables on every board t8132-j713-pciec-tunables.dtsi holds the USB4 PCIe tunnel calibration (ADT apciec0/1 atc-apcie-debug, -fabric and -rc tunables and the bridge's apcie-config-tunables). These are SoC values, not J713 ones: all of them match in the J713 and J773g ADTs, and the J715 ADT agrees with the J713. Rename the file to t8132-pciec-tunables.dtsi and include it from t8132.dtsi. The J713 and J715 dtbs are byte-identical. The J604, J623, J624 and J773g dtbs gain the eight tunable properties on their PCIe-C nodes, which stay disabled. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi | 1 - ...-j713-pciec-tunables.dtsi => t8132-pciec-tunables.dtsi} | 7 ++++--- arch/arm64/boot/dts/apple/t8132.dtsi | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) rename arch/arm64/boot/dts/apple/{t8132-j713-pciec-tunables.dtsi => t8132-pciec-tunables.dtsi} (91%) diff --git a/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi index e8205102f27e8..ee0fe73467e64 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-j715.dtsi @@ -360,4 +360,3 @@ #include "t8132-j713-atcphy-tunables.dtsi" #include "t8132-j713-usb4.dtsi" #include "t8132-j713-usb4-tunables.dtsi" -#include "t8132-j713-pciec-tunables.dtsi" diff --git a/arch/arm64/boot/dts/apple/t8132-j713-pciec-tunables.dtsi b/arch/arm64/boot/dts/apple/t8132-pciec-tunables.dtsi similarity index 91% rename from arch/arm64/boot/dts/apple/t8132-j713-pciec-tunables.dtsi rename to arch/arm64/boot/dts/apple/t8132-pciec-tunables.dtsi index 4d6cde726c2b3..bf0575c4b79aa 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-pciec-tunables.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-pciec-tunables.dtsi @@ -1,8 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * J713 PCIe-C (USB4 PCIe tunnel) calibration, converted from the ADT the way - * m1n1 does it. The J713 boot chain does not pass it on yet, so it is - * described here until a bootloader fills it in. + * T8132 PCIe-C (USB4 PCIe tunnel) calibration, converted from the ADT + * apciec0/1 tunables, which match on the J713, J715 and J773g. + * + * Copyright The Asahi Linux Contributors */ &usb4_0_pcie { diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index 5d636014bea45..278d539d9e841 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -920,6 +920,7 @@ #include "t8132-pmgr.dtsi" #include "t8132-usb4.dtsi" +#include "t8132-pciec-tunables.dtsi" /* Shared controller resources; board files select the qualified devices. */ &soc { From c5fd88efa4b6e29432313c47dc0d5aa714b0d0e0 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:32:53 -0500 Subject: [PATCH 06/17] arm64: dts: apple: t604x: describe the T6040-only blocks in t6040.dtsi t604x.dtsi and t604x-pmgr.dtsi describe everything the T6040 tree uses, and t6041.dtsi deletes the 194 nodes and 26 properties the J616c has not qualified, then re-adds the GPU, its mailbox and the P-core OPP tables. Turn that around. t604x.dtsi and t604x-pmgr.dtsi now hold only what both trees use. The rest moves to the T6040 side: the 158 power domains into a new t6040-pmgr.dtsi, and the other blocks, the CPU PMU, the Abbey PMIC and the properties t6041.dtsi deleted into t6040.dtsi. t6041.dtsi no longer deletes anything; it keeps its own GPU, OPP tables, Chapel PMIC and register overrides. The J773s and J616c ADTs list the same PMGR domains at the same offsets, so this records what each tree has qualified, not a hardware difference. No output change: every T604x dtb has the same nodes and properties, and its phandle references point at the same nodes; only node order and phandle numbers move. The T8132 dtbs are byte-identical. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t6040-pmgr.dtsi | 1663 +++++++++++++++++++++ arch/arm64/boot/dts/apple/t6040.dtsi | 775 ++++++++++ arch/arm64/boot/dts/apple/t6041.dtsi | 307 +--- arch/arm64/boot/dts/apple/t604x-pmgr.dtsi | 1637 +------------------- arch/arm64/boot/dts/apple/t604x.dtsi | 712 --------- 5 files changed, 2448 insertions(+), 2646 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t6040-pmgr.dtsi diff --git a/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi new file mode 100644 index 0000000000000..60752a9cf9882 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi @@ -0,0 +1,1663 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * T6040 PMGR power domains the T6041 tree does not describe yet. + * + * The J773s and J616c ADTs list the same domains at the same offsets; + * t604x-pmgr.dtsi holds the ones the J616c has qualified. + * + * Copyright The Asahi Linux Contributors + */ + +&pmgr { + ps_apcie_gp: power-controller@100 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x100 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "apcie_gp"; + status = "disabled"; + }; + + ps_fab4_soc: power-controller@128 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x128 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab4_soc"; + power-domains = <&ps_afc>; + apple,always-on; + }; + + ps_sio_cpu: power-controller@130 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x130 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "sio_cpu"; + power-domains = <&ps_sio>; + apple,always-on; + status = "disabled"; + }; + + ps_fpwm1: power-controller@140 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x140 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fpwm1"; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + ps_fpwm2: power-controller@148 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x148 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fpwm2"; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + ps_i2c0: power-controller@150 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x150 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "i2c0"; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + ps_i2c5: power-controller@178 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x178 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "i2c5"; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + ps_i2c7: power-controller@188 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x188 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "i2c7"; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + ps_uart_p: power-controller@1a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart_p"; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + ps_dpa_p: power-controller@1a8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1a8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dpa_p"; + power-domains = <&ps_sio>; + apple,always-on; + status = "disabled"; + }; + + ps_aes: power-controller@1b0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1b0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "aes"; + power-domains = <&ps_sio>; + apple,always-on; + status = "disabled"; + }; + + ps_spi0: power-controller@1b8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1b8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "spi0"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_spi1: power-controller@1c0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1c0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "spi1"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_spi3: power-controller@1d0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1d0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "spi3"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_spi4: power-controller@1d8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1d8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "spi4"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_spi5: power-controller@1e0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1e0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "spi5"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_qspi: power-controller@1e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1e8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "qspi"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_uart_n: power-controller@1f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1f0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart_n"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart0: power-controller@1f8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1f8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart0"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart1: power-controller@200 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x200 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart1"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart2: power-controller@208 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x208 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart2"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart3: power-controller@210 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x210 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart3"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart4: power-controller@218 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x218 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart4"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart5: power-controller@220 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x220 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart5"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_uart6: power-controller@228 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x228 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "uart6"; + power-domains = <&ps_uart_p>; + status = "disabled"; + }; + + ps_dpa0: power-controller@230 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x230 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dpa0"; + power-domains = <&ps_dpa_p>; + status = "disabled"; + }; + + ps_dpa1: power-controller@238 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x238 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dpa1"; + power-domains = <&ps_dpa_p>; + status = "disabled"; + }; + + ps_dpa2: power-controller@240 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x240 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dpa2"; + power-domains = <&ps_dpa_p>; + status = "disabled"; + }; + + ps_dpa3: power-controller@248 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x248 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dpa3"; + power-domains = <&ps_dpa_p>; + status = "disabled"; + }; + + ps_dpa4: power-controller@250 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x250 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dpa4"; + power-domains = <&ps_dpa_p>; + status = "disabled"; + }; + + ps_disp_sys: power-controller@258 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x258 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "disp_sys"; + power-domains = <&ps_fab6_soc>; + status = "disabled"; + }; + + ps_amcc4: power-controller@260 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x260 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc4"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc5: power-controller@268 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x268 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc5"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc6: power-controller@270 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x270 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc6"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc7: power-controller@278 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x278 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc7"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc12: power-controller@280 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x280 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc12"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc13: power-controller@288 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x288 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc13"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc14: power-controller@290 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x290 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc14"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc15: power-controller@298 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x298 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc15"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_04: power-controller@2e0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2e0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_04"; + power-domains = <&ps_amcc4>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_05: power-controller@2e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2e8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_05"; + power-domains = <&ps_amcc5>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_06: power-controller@2f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2f0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_06"; + power-domains = <&ps_amcc6>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_07: power-controller@2f8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2f8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_07"; + power-domains = <&ps_amcc7>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_12: power-controller@300 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x300 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_12"; + power-domains = <&ps_amcc12>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_13: power-controller@308 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x308 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_13"; + power-domains = <&ps_amcc13>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_14: power-controller@310 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x310 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_14"; + power-domains = <&ps_amcc14>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_15: power-controller@318 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x318 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_15"; + power-domains = <&ps_amcc15>; + apple,always-on; + status = "disabled"; + }; + + ps_disp_fe: power-controller@368 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x368 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "disp_fe"; + power-domains = <&ps_disp_sys>; + status = "disabled"; + }; + + ps_apcie_sys_gp: power-controller@390 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x390 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "apcie_sys_gp"; + power-domains = <&ps_fab3_soc>, <&ps_apcie_gp>; + status = "disabled"; + }; + + ps_apcie_phy_sw: power-controller@398 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x398 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "apcie_phy_sw"; + power-domains = <&ps_apcie_sys_st0>, <&ps_apcie_sys_st1>; + status = "disabled"; + }; + + ps_jpg: power-controller@3a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "jpg"; + power-domains = <&ps_fab4_soc>; + status = "disabled"; + }; +}; + +&pmgr_aux { + ps_ecpu_0: power-controller@0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_0"; + status = "disabled"; + }; + + ps_ecpu_1: power-controller@8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_1"; + status = "disabled"; + }; + + ps_ecpu_2: power-controller@10 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x10 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_2"; + status = "disabled"; + }; + + ps_ecpu_3: power-controller@18 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x18 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpu_3"; + status = "disabled"; + }; + + ps_pcpu0_0: power-controller@20 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x20 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_0"; + status = "disabled"; + }; + + ps_pcpu0_1: power-controller@28 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x28 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_1"; + status = "disabled"; + }; + + ps_pcpu0_2: power-controller@30 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x30 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_2"; + status = "disabled"; + }; + + ps_pcpu0_3: power-controller@38 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x38 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_3"; + status = "disabled"; + }; + + ps_pcpu0_4: power-controller@40 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x40 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_4"; + status = "disabled"; + }; + + ps_pcpu0_5: power-controller@48 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x48 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu0_5"; + status = "disabled"; + }; + + ps_pcpu1_0: power-controller@50 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x50 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_0"; + status = "disabled"; + }; + + ps_pcpu1_1: power-controller@58 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x58 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_1"; + status = "disabled"; + }; + + ps_pcpu1_2: power-controller@60 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x60 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_2"; + status = "disabled"; + }; + + ps_pcpu1_3: power-controller@68 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x68 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_3"; + status = "disabled"; + }; + + ps_pcpu1_4: power-controller@70 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x70 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_4"; + status = "disabled"; + }; + + ps_pcpu1_5: power-controller@78 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x78 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpu1_5"; + status = "disabled"; + }; + + ps_ecpm: power-controller@80 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x80 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ecpm"; + status = "disabled"; + }; + + ps_pcpm0: power-controller@88 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x88 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpm0"; + status = "disabled"; + }; + + ps_pcpm1: power-controller@90 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x90 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pcpm1"; + status = "disabled"; + }; + + ps_dwi: power-controller@108 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x108 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dwi"; + status = "disabled"; + }; + + ps_aic: power-controller@118 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x118 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "aic"; + power-domains = <&ps_pms>; + status = "disabled"; + }; + + ps_pmc: power-controller@120 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x120 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pmc"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_pms_c1ppt: power-controller@128 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x128 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pms_c1ppt"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_soc_dpe: power-controller@130 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x130 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "soc_dpe"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_pmgr_soc_ocla: power-controller@138 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x138 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pmgr_soc_ocla"; + status = "disabled"; + }; + + ps_pms_fpwm0: power-controller@140 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x140 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pms_fpwm0"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_pms_fpwm1: power-controller@148 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x148 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pms_fpwm1"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_pms_fpwm2: power-controller@150 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x150 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pms_fpwm2"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_pms_fpwm3: power-controller@158 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x158 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pms_fpwm3"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_pms_fpwm4: power-controller@160 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x160 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "pms_fpwm4"; + power-domains = <&ps_pms>; + apple,always-on; + status = "disabled"; + }; + + ps_fab0_soc: power-controller@168 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x168 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab0_soc"; + power-domains = <&ps_afi>; + apple,always-on; + }; + + ps_amcc0: power-controller@180 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x180 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc0"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_00: power-controller@188 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x188 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_00"; + power-domains = <&ps_amcc0>; + apple,always-on; + status = "disabled"; + }; + + ps_rom: power-controller@190 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x190 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "rom"; + power-domains = <&ps_amcc0>; + status = "disabled"; + }; + + ps_amcc1: power-controller@198 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x198 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc1"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_01: power-controller@1a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_01"; + power-domains = <&ps_amcc1>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc2: power-controller@1a8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1a8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc2"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_02: power-controller@1b0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1b0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_02"; + power-domains = <&ps_amcc2>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc3: power-controller@1b8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1b8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc3"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_03: power-controller@1c0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1c0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_03"; + power-domains = <&ps_amcc3>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc8: power-controller@1c8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1c8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc8"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_08: power-controller@1d0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1d0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_08"; + power-domains = <&ps_amcc8>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc9: power-controller@1d8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1d8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc9"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_09: power-controller@1e0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1e0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_09"; + power-domains = <&ps_amcc9>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc10: power-controller@1e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1e8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc10"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_10: power-controller@1f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1f0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_10"; + power-domains = <&ps_amcc10>; + apple,always-on; + status = "disabled"; + }; + + ps_amcc11: power-controller@1f8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1f8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "amcc11"; + power-domains = <&ps_afc>; + apple,always-on; + status = "disabled"; + }; + + ps_dcs_11: power-controller@200 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x200 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_11"; + power-domains = <&ps_amcc11>; + apple,always-on; + status = "disabled"; + }; + + ps_venc0_sys: power-controller@278 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x278 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_sys"; + power-domains = <&ps_fab0_soc>; + status = "disabled"; + }; + + ps_fab_gw_0: power-controller@288 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x288 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab_gw_0"; + apple,always-on; + status = "disabled"; + }; + + ps_fab_gw_1: power-controller@290 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x290 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab_gw_1"; + apple,always-on; + status = "disabled"; + }; + + ps_fab_afr: power-controller@298 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x298 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab_afr"; + apple,always-on; + status = "disabled"; + }; + + ps_fab1_soc: power-controller@2d0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2d0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab1_soc"; + power-domains = <&ps_afi>; + apple,always-on; + status = "disabled"; + }; + + ps_scodec: power-controller@328 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x328 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "scodec"; + power-domains = <&ps_fab1_soc>; + status = "disabled"; + }; + + ps_scodec_streaming: power-controller@330 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x330 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "scodec_streaming"; + power-domains = <&ps_scodec>; + status = "disabled"; + }; + + ps_fab2_soc: power-controller@338 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x338 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab2_soc"; + power-domains = <&ps_afi>; + apple,always-on; + }; + + ps_dispext0_sys: power-controller@340 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x340 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dispext0_sys"; + power-domains = <&ps_fab2_soc>; + status = "disabled"; + }; + + ps_dispext0_fe: power-controller@348 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x348 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dispext0_fe"; + power-domains = <&ps_dispext0_sys>; + status = "disabled"; + }; + + ps_dispext0_cpu: power-controller@350 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x350 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dispext0_cpu"; + power-domains = <&ps_dispext0_fe>; + status = "disabled"; + }; + + ps_atc0_cio: power-controller@398 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x398 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc0_cio"; + power-domains = <&ps_atc0_common>; + status = "disabled"; + }; + + ps_atc0_pcie: power-controller@3a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc0_pcie"; + power-domains = <&ps_atc0_common>; + status = "disabled"; + }; + + ps_atc0_cio_pcie: power-controller@3a8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3a8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc0_cio_pcie"; + power-domains = <&ps_atc0_cio>; + status = "disabled"; + }; + + ps_atc0_cio_usb: power-controller@3b0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3b0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc0_cio_usb"; + power-domains = <&ps_atc0_cio>; + status = "disabled"; + }; + + ps_atc1_cio: power-controller@3c0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3c0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc1_cio"; + power-domains = <&ps_atc1_common>; + status = "disabled"; + }; + + ps_atc1_pcie: power-controller@3c8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3c8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc1_pcie"; + power-domains = <&ps_atc1_common>; + status = "disabled"; + }; + + ps_atc1_cio_pcie: power-controller@3d0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3d0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc1_cio_pcie"; + power-domains = <&ps_atc1_cio>; + status = "disabled"; + }; + + ps_atc1_cio_usb: power-controller@3d8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3d8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc1_cio_usb"; + power-domains = <&ps_atc1_cio>; + status = "disabled"; + }; + + ps_atc2_cio: power-controller@3e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3e8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc2_cio"; + power-domains = <&ps_atc2_common>; + status = "disabled"; + }; + + ps_atc2_pcie: power-controller@3f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3f0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc2_pcie"; + power-domains = <&ps_atc2_common>; + status = "disabled"; + }; + + ps_atc2_cio_pcie: power-controller@3f8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3f8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc2_cio_pcie"; + power-domains = <&ps_atc2_cio>; + status = "disabled"; + }; + + ps_atc2_cio_usb: power-controller@400 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x400 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc2_cio_usb"; + power-domains = <&ps_atc2_cio>; + status = "disabled"; + }; + + ps_atc3_cio: power-controller@420 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x420 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc3_cio"; + power-domains = <&ps_atc3_common>; + status = "disabled"; + }; + + ps_atc3_pcie: power-controller@428 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x428 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc3_pcie"; + power-domains = <&ps_atc3_common>; + status = "disabled"; + }; + + ps_atc3_cio_pcie: power-controller@430 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x430 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc3_cio_pcie"; + power-domains = <&ps_atc3_cio>; + status = "disabled"; + }; + + ps_atc3_cio_usb: power-controller@438 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x438 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "atc3_cio_usb"; + power-domains = <&ps_atc3_cio>; + status = "disabled"; + }; + + ps_fab5_soc: power-controller@440 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x440 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab5_soc"; + power-domains = <&ps_afi>; + apple,always-on; + }; + + ps_sbr: power-controller@448 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x448 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "sbr"; + power-domains = <&ps_fab5_soc>; + apple,always-on; + status = "disabled"; + }; + + ps_gpio: power-controller@450 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x450 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "gpio"; + power-domains = <&ps_sbr>; + status = "disabled"; + }; + + ps_msg: power-controller@458 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x458 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msg"; + power-domains = <&ps_sbr>; + status = "disabled"; + }; + + ps_ap_tmm: power-controller@468 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x468 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "ap_tmm"; + power-domains = <&ps_sbr>; + status = "disabled"; + }; + + ps_msr0: power-controller@470 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x470 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr0"; + power-domains = <&ps_fab5_soc>; + status = "disabled"; + }; + + ps_msr0_ase_core: power-controller@478 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x478 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "msr0_ase_core"; + power-domains = <&ps_msr0>; + status = "disabled"; + }; + + ps_fab7_soc: power-controller@488 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x488 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab7_soc"; + power-domains = <&ps_afi>; + apple,always-on; + status = "disabled"; + }; + + ps_dispext1_sys: power-controller@490 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x490 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dispext1_sys"; + power-domains = <&ps_fab7_soc>; + status = "disabled"; + }; + + ps_dispext1_fe: power-controller@498 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x498 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dispext1_fe"; + power-domains = <&ps_dispext1_sys>; + status = "disabled"; + }; + + ps_dispext1_cpu: power-controller@4a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x4a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dispext1_cpu"; + power-domains = <&ps_dispext1_fe>; + status = "disabled"; + }; +}; + +&pmgr_mini { + ps_debug_gated: power-controller@0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "debug_gated"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi_ahb: power-controller@58 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x58 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi_ahb"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi0: power-controller@60 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x60 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi0"; + power-domains = <&ps_nub_spmi_ahb>; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi_a2: power-controller@78 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x78 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi_a2"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spi0: power-controller@80 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x80 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spi0"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_aon: power-controller@88 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x88 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_aon"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_ocla: power-controller@98 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x98 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_ocla"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi1: power-controller@c0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0xc0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi1"; + power-domains = <&ps_nub_spmi_ahb>; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi2: power-controller@e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0xe8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi2"; + power-domains = <&ps_nub_spmi_ahb>; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi3: power-controller@f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0xf0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi3"; + power-domains = <&ps_nub_spmi_ahb>; + apple,always-on; + status = "disabled"; + }; + + ps_nub_spmi4: power-controller@f8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0xf8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_spmi4"; + power-domains = <&ps_nub_spmi_ahb>; + apple,always-on; + status = "disabled"; + }; + + ps_nub_fabric: power-controller@100 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x100 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_fabric"; + apple,always-on; + status = "disabled"; + }; + + ps_nub_sram: power-controller@108 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x108 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_sram"; + power-domains = <&ps_nub_fabric>; + apple,always-on; + status = "disabled"; + }; + + ps_debug_switch: power-controller@110 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x110 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "debug_switch"; + apple,always-on; + status = "disabled"; + }; +}; + +&pmgr_gfx { + ps_gpx: power-controller@0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "gpx"; + apple,always-on; + status = "disabled"; + }; +}; + +&pmgr_disp { + ps_disp_cpu: power-controller@0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "disp_cpu"; + power-domains = <&ps_disp_fe>; + status = "disabled"; + }; +}; + +&pmgr_venc { + ps_venc0_dma: power-controller@0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_dma"; + power-domains = <&ps_venc0_sys>; + status = "disabled"; + }; + + ps_venc0_pipe4: power-controller@8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_pipe4"; + power-domains = <&ps_venc0_dma>; + status = "disabled"; + }; + + ps_venc0_pipe5: power-controller@10 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x10 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_pipe5"; + power-domains = <&ps_venc0_dma>; + status = "disabled"; + }; + + ps_venc0_me0: power-controller@18 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x18 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_me0"; + power-domains = <&ps_venc0_dma>; + status = "disabled"; + }; + + ps_venc0_me1: power-controller@20 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x20 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_me1"; + power-domains = <&ps_venc0_me0>; + status = "disabled"; + }; +}; + +&ps_avd_sys { + power-domains = <&ps_fab0_soc>; +}; + +&ps_atc0_common { + power-domains = <&ps_fab2_soc>; +}; + +&ps_atc1_common { + power-domains = <&ps_fab2_soc>; +}; + +&ps_atc2_common { + power-domains = <&ps_fab2_soc>; +}; + +&ps_atc3_common { + power-domains = <&ps_fab2_soc>; +}; + +&ps_ane_sys { + power-domains = <&ps_fab5_soc>, <&ps_fab4_soc>; +}; + +&ps_pmp { + power-domains = <&ps_pms>; +}; + +&ps_pms_sram { + power-domains = <&ps_pms>; +}; diff --git a/arch/arm64/boot/dts/apple/t6040.dtsi b/arch/arm64/boot/dts/apple/t6040.dtsi index c901f331bc03e..8676d3ef0a74e 100644 --- a/arch/arm64/boot/dts/apple/t6040.dtsi +++ b/arch/arm64/boot/dts/apple/t6040.dtsi @@ -6,6 +6,781 @@ */ #include "t604x.dtsi" + +/* Blocks and properties the T6041 tree does not describe yet. */ +/ { + opp_p0: opp-table-p0 { + compatible = "operating-points-v2"; + opp-shared; + + opp01 { + opp-hz = /bits/ 64 <1260000000>; + opp-level = <1>; + opp-microwatt = <513000>; + }; + opp02 { + opp-hz = /bits/ 64 <1512000000>; + opp-level = <2>; + opp-microwatt = <715000>; + }; + opp03 { + opp-hz = /bits/ 64 <1800000000>; + opp-level = <3>; + opp-microwatt = <907500>; + }; + opp04 { + opp-hz = /bits/ 64 <2088000000>; + opp-level = <4>; + opp-microwatt = <1158200>; + }; + opp05 { + opp-hz = /bits/ 64 <2352000000>; + opp-level = <5>; + opp-microwatt = <1494500>; + }; + opp06 { + opp-hz = /bits/ 64 <2616000000>; + opp-level = <6>; + opp-microwatt = <1782600>; + }; + opp07 { + opp-hz = /bits/ 64 <2868000000>; + opp-level = <7>; + opp-microwatt = <2209600>; + }; + opp08 { + opp-hz = /bits/ 64 <3096000000>; + opp-level = <8>; + opp-microwatt = <2636700>; + }; + opp09 { + opp-hz = /bits/ 64 <3300000000>; + opp-level = <9>; + opp-microwatt = <3247200>; + }; + opp10 { + opp-hz = /bits/ 64 <3468000000>; + opp-level = <10>; + opp-microwatt = <3668700>; + }; + opp11 { + opp-hz = /bits/ 64 <3624000000>; + opp-level = <11>; + opp-microwatt = <4128200>; + }; + opp12 { + opp-hz = /bits/ 64 <3756000000>; + opp-level = <12>; + opp-microwatt = <4819300>; + }; + opp13 { + opp-hz = /bits/ 64 <3852000000>; + opp-level = <13>; + opp-microwatt = <4977700>; + }; + opp14 { + opp-hz = /bits/ 64 <3924000000>; + opp-level = <14>; + opp-microwatt = <5315900>; + }; + opp15 { + opp-hz = /bits/ 64 <3996000000>; + opp-level = <15>; + opp-microwatt = <5575900>; + }; + opp16 { + opp-hz = /bits/ 64 <4044000000>; + opp-level = <16>; + opp-microwatt = <5773400>; + }; + opp17 { + opp-hz = /bits/ 64 <4104000000>; + opp-level = <17>; + opp-microwatt = <5969200>; + }; + opp18 { + opp-hz = /bits/ 64 <4416000000>; + opp-level = <18>; + opp-microwatt = <8274900>; + }; + opp19 { + opp-hz = /bits/ 64 <4512000000>; + opp-level = <19>; + opp-microwatt = <9256900>; + }; + }; + + opp_p1: opp-table-p1 { + compatible = "operating-points-v2"; + opp-shared; + + opp01 { + opp-hz = /bits/ 64 <1260000000>; + opp-level = <1>; + opp-microwatt = <561800>; + }; + opp02 { + opp-hz = /bits/ 64 <1512000000>; + opp-level = <2>; + opp-microwatt = <772500>; + }; + opp03 { + opp-hz = /bits/ 64 <1800000000>; + opp-level = <3>; + opp-microwatt = <988900>; + }; + opp04 { + opp-hz = /bits/ 64 <2088000000>; + opp-level = <4>; + opp-microwatt = <1302300>; + }; + opp05 { + opp-hz = /bits/ 64 <2352000000>; + opp-level = <5>; + opp-microwatt = <1644100>; + }; + opp06 { + opp-hz = /bits/ 64 <2616000000>; + opp-level = <6>; + opp-microwatt = <2003700>; + }; + opp07 { + opp-hz = /bits/ 64 <2868000000>; + opp-level = <7>; + opp-microwatt = <2349000>; + }; + opp08 { + opp-hz = /bits/ 64 <3096000000>; + opp-level = <8>; + opp-microwatt = <2723000>; + }; + opp09 { + opp-hz = /bits/ 64 <3300000000>; + opp-level = <9>; + opp-microwatt = <3333200>; + }; + opp10 { + opp-hz = /bits/ 64 <3468000000>; + opp-level = <10>; + opp-microwatt = <3711900>; + }; + opp11 { + opp-hz = /bits/ 64 <3624000000>; + opp-level = <11>; + opp-microwatt = <4129900>; + }; + opp12 { + opp-hz = /bits/ 64 <3756000000>; + opp-level = <12>; + opp-microwatt = <4666300>; + }; + opp13 { + opp-hz = /bits/ 64 <3852000000>; + opp-level = <13>; + opp-microwatt = <4881000>; + }; + opp14 { + opp-hz = /bits/ 64 <3924000000>; + opp-level = <14>; + opp-microwatt = <5176700>; + }; + opp15 { + opp-hz = /bits/ 64 <3996000000>; + opp-level = <15>; + opp-microwatt = <5306500>; + }; + opp16 { + opp-hz = /bits/ 64 <4044000000>; + opp-level = <16>; + opp-microwatt = <5618900>; + }; + opp17 { + opp-hz = /bits/ 64 <4104000000>; + opp-level = <17>; + opp-microwatt = <5843100>; + }; + opp18 { + opp-hz = /bits/ 64 <4416000000>; + opp-level = <18>; + opp-microwatt = <8075300>; + }; + opp19 { + opp-hz = /bits/ 64 <4512000000>; + opp-level = <19>; + opp-microwatt = <8949200>; + }; + }; + + cpu_pmu: pmu { + compatible = "apple,t6040-pmu"; + interrupt-parent = <&aic>; + /* The AIC raises both clusters' PMU FIQs as this one. */ + interrupts = ; + }; + + /* Named after its sgx range: the coprocessor range is the mailbox node's too. */ + gpu: gpu@288000000 { + compatible = "apple,agx-t6040"; + reg = <0x2 0x8a600000 0x0 0x88000>, + <0x2 0x88000000 0x0 0x3758000>; + reg-names = "asc", "sgx"; + mboxes = <&gfx_mbox>; + power-domains = <&pmp_gfx>; + apple,clpc = <&clpc>; + status = "disabled"; + }; + + gfx_mbox: mailbox@28a600000 { + compatible = "apple,t6040-ascwrap-v6"; + reg = <0x2 0x8a600000 0x0 0x88000>, + <0x2 0x8a050000 0x0 0x8>; + reg-names = "wrapper", "iop-vbar"; + interrupt-parent = <&aic>; + interrupts = , + ; + interrupt-names = "send-empty", "recv-not-empty"; + apple,firmware-role = "GFX"; + power-domains = <&ps_gfx>; + #mbox-cells = <0>; + status = "disabled"; + }; + + pmgr_disp: power-management@502290000 { + compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; + reg = <0x5 0x02290000 0x0 0x4000>; + #address-cells = <1>; + #size-cells = <1>; + }; + + pmgr_venc: power-management@502808000 { + compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; + reg = <0x5 0x02808000 0x0 0x4000>; + #address-cells = <1>; + #size-cells = <1>; + }; +}; + +&pmc { + /* + * The SoC rail at its highest state. The video encoder runs on + * the fabric clock and encodes at less than half speed below it. + */ + pmc_soc_max: floor-soc-max { + label = "soc-max"; + #power-domain-cells = <0>; + apple,rail = <1>; + apple,level = <2>; + }; +}; + +&nub_spmi0 { + pmic_abbey: pmic@e { + compatible = "apple,abbey-pmic", "apple,spmi-nvmem"; + reg = <0xe SPMI_USID>; + + pmu_rtc: rtc { + compatible = "apple,t6041-pmu-rtc"; + interrupt-parent = <&nub_spmi0>; + interrupts = <2 IRQ_TYPE_EDGE_RISING>; + nvmem-cells = <&rtc_offset>; + nvmem-cell-names = "rtc_offset"; + wakeup-source; + }; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + rtc_offset: rtc-offset@2100 { + reg = <0x2100 0x6>; + }; + + boot_stage: boot-stage@f801 { + reg = <0xf801 0x1>; + }; + + boot_error_count: boot-error-count@f802,0 { + reg = <0xf802 0x1>; + bits = <0 4>; + }; + + panic_count: panic-count@f802,4 { + reg = <0xf802 0x1>; + bits = <4 4>; + }; + + shutdown_flag: shutdown-flag@f80f,3 { + reg = <0xf80f 0x1>; + bits = <3 1>; + }; + }; + }; +}; + +&aop { + /* The calibration properties come from the bootloader. */ + aop_accel: accel { + compatible = "apple,t6041-aop-accel", "apple,aop-accel"; + }; + + aop_gyro: gyro { + compatible = "apple,t6041-aop-gyro", "apple,aop-gyro"; + }; +}; + +/ { + /* Additional DARTs; enabled together with their DMA consumers. */ + ave0_dart1: iommu@283080000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x2 0x83080000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc0_sys>; + status = "disabled"; + }; + + ave0_dart0: iommu@2830a0000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x2 0x830a0000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc0_sys>; + status = "disabled"; + }; + + apr0_dart: iommu@301020000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x01020000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_scodec>; + status = "disabled"; + }; + + apciec0_dart: iommu@384000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x84000000 0x0 0x20000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + apciec1_dart: iommu@38c000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x8c000000 0x0 0x20000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + apciec2_dart: iommu@394000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x94000000 0x0 0x20000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + apcie1_dart: iommu@411000000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x11000000 0x0 0x20000>; + #iommu-cells = <1>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + sio_dart: iommu@429060000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x29060000 0x0 0x20000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x1c000 0x2ff 0xfffe4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + jpeg0: jpeg@487000000 { + compatible = "apple,t6041-jpeg"; + reg = <0x4 0x87000000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&jpeg0_dart 0>; + power-domains = <&ps_jpg>; + apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; + status = "disabled"; + }; + + jpeg0_dart: iommu@487020000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x87020000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + status = "disabled"; + }; + + jpeg1: jpeg@487060000 { + compatible = "apple,t6041-jpeg"; + reg = <0x4 0x87060000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&jpeg1_dart 0>; + power-domains = <&ps_jpg>; + apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; + status = "disabled"; + }; + + jpeg1_dart: iommu@487080000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x87080000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + status = "disabled"; + }; + + scaler0_dart: iommu@521260000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x5 0x21260000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_msr0>; + status = "disabled"; + }; + + pinctrl_smc: pinctrl@50c824000 { + compatible = "apple,t6041-pinctrl", "apple,t8103-pinctrl"; + reg = <0x5 0x0c824000 0x0 0x4000>; + clocks = <&clkref>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinctrl_smc 0 0 24>; + apple,npins = <24>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + , + , + ; + /* Coprocessor pins and interrupt groups need an ownership handoff. */ + status = "disabled"; + }; + + nub_spmi1: spmi@509054000 { + compatible = "apple,t6041-spmi", "apple,t8103-spmi"; + reg = <0x5 0x09054000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + power-domains = <&ps_nub_spmi1>; + status = "disabled"; + }; + + nub_spmi2: spmi@509094000 { + compatible = "apple,t6041-spmi", "apple,t8103-spmi"; + reg = <0x5 0x09094000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + power-domains = <&ps_nub_spmi2>; + status = "disabled"; + }; + + nub_spmi3: spmi@5090d4000 { + compatible = "apple,t6041-spmi", "apple,t8103-spmi"; + reg = <0x5 0x090d4000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + power-domains = <&ps_nub_spmi3>; + status = "disabled"; + }; + + nub_spmi4: spmi@509114000 { + compatible = "apple,t6041-spmi", "apple,t8103-spmi"; + reg = <0x5 0x09114000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + power-domains = <&ps_nub_spmi4>; + status = "disabled"; + }; + + aop_spmi0: spmi@510914000 { + compatible = "apple,t6041-spmi", "apple,t8103-spmi"; + reg = <0x5 0x10914000 0x0 0x100>; + #address-cells = <2>; + #size-cells = <0>; + #interrupt-cells = <2>; + interrupt-controller; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* The QSPIMC input is ADT clock 434 (200 MHz). */ + clk_200m: clock-200m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + clock-output-names = "clk_200m"; + }; + + spi4: spi@429110000 { + compatible = "apple,t6041-spi", "apple,t8103-spi"; + reg = <0x4 0x29110000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clkref>; + power-domains = <&ps_spi4>; + #address-cells = <1>; + #size-cells = <0>; + /* Panel/TCON control belongs to the display firmware. */ + status = "disabled"; + }; + + qspi: spi@429118000 { + compatible = "apple,t6041-qspi"; + reg = <0x4 0x29118000 0x0 0x4800>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clk_200m>; + power-domains = <&ps_qspi>; + #address-cells = <1>; + #size-cells = <0>; + /* Boards enable it with their flash and its nvram partition. */ + status = "disabled"; + }; + + /* The loader supplies the SIO firmware regions and protocol tables. */ + sio: dma-controller@429e00000 { + compatible = "apple,t6041-sio"; + reg = <0x4 0x29e00000 0x0 0x8000>; + dma-channels = <128>; + #dma-cells = <1>; + mboxes = <&sio_mbox>; + iommus = <&sio_dart 0>; + power-domains = <&ps_sio_cpu>; + status = "disabled"; + }; + + sio_mbox: mailbox@429e08000 { + compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x4 0x29e08000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + power-domains = <&ps_sio_cpu>; + status = "disabled"; + }; + + /* The video encoder stays disabled until its firmware backend is available. */ + ave: video-codec@283100000 { + compatible = "apple,t6041-ave"; + reg = <0x2 0x83100000 0x0 0x45c000>, + <0x2 0x83050000 0x0 0x4000>, + <0x2 0x83800000 0x0 0x800000>; + reg-names = "codec", "mailbox", "coproc"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc0_dma>, <&ps_venc0_pipe4>, + <&ps_venc0_pipe5>, <&ps_venc0_me0>, <&ps_venc0_me1>, + <&pmc_soc_max>; + power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1", "perf"; + iommus = <&ave0_dart0 0>, <&ave0_dart1 0>; + status = "disabled"; + }; + + dcuart: serial@50883c000 { + compatible = "apple,dockchannel-uart"; + reg = <0x5 0x0883c000 0x0 0x4000>, + <0x5 0x08838000 0x0 0x4000>, + <0x5 0x0880c000 0x0 0x4000>; + reg-names = "data", "config", "irq"; + interrupt-parent = <&aic>; + interrupts = ; + apple,channel = <2>; + apple,sw-drain; + status = "disabled"; + }; + + /* ACIO 0 remains disabled until its host-router handoff is supported. */ + usb4_0_mbox: mailbox@381108000 { + compatible = "apple,t6041-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>; + power-domains = <&ps_atc0_cio>; + status = "disabled"; + }; + + usb4_0_dart: iommu@381a80000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x81a80000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ACIO 1 remains disabled until its host-router handoff is supported. */ + usb4_1_mbox: mailbox@389108000 { + compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x3 0x89108000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + power-domains = <&ps_atc1_cio>; + status = "disabled"; + }; + + usb4_1_dart: iommu@389a80000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x89a80000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; + + /* ACIO 2 remains disabled until its host-router handoff is supported. */ + usb4_2_mbox: mailbox@391108000 { + compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x3 0x91108000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + power-domains = <&ps_atc2_cio>; + status = "disabled"; + }; + + usb4_2_dart: iommu@391a80000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x3 0x91a80000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + status = "disabled"; + }; +}; + +&avd { + power-domains = <&ps_avd_sys>, <&pmc_soc_max>; + power-domain-names = "core", "perf"; +}; + +&usb_drd0_dart_0 { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&usb_drd0_dart_1 { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&usb_drd1_dart_0 { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&usb_drd1_dart_1 { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&usb_drd2_dart_0 { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&usb_drd2_dart_1 { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&mtp_dart { + apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; +}; + +&{/opp-table-e/opp01} { + opp-microwatt = <81900>; +}; + +&{/opp-table-e/opp02} { + opp-microwatt = <133100>; +}; + +&{/opp-table-e/opp03} { + opp-microwatt = <209400>; +}; + +&{/opp-table-e/opp04} { + opp-microwatt = <301400>; +}; + +&{/opp-table-e/opp05} { + opp-microwatt = <383900>; +}; + +&{/opp-table-e/opp06} { + opp-microwatt = <478500>; +}; + +&{/opp-table-e/opp07} { + opp-microwatt = <531000>; +}; + +&serial0 { + power-domains = <&ps_uart0>; + status = "disabled"; +}; + +&pmc { + apple,pmp = <&pmp>; +}; + +#include "t6040-pmgr.dtsi" #include "t6040-peripherals.dtsi" /* The M4 Pro has five cores in each P cluster. */ diff --git a/arch/arm64/boot/dts/apple/t6041.dtsi b/arch/arm64/boot/dts/apple/t6041.dtsi index 094a7c4bd8fa6..77cf66abf0f97 100644 --- a/arch/arm64/boot/dts/apple/t6041.dtsi +++ b/arch/arm64/boot/dts/apple/t6041.dtsi @@ -1,210 +1,15 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT -// Copyright The Asahi Linux Contributors +/* + * Apple T6041 "M4 Max" SoC + * + * Copyright The Asahi Linux Contributors + */ #include "t604x.dtsi" - -/* Keep the validated T6041 topology independent of unqualified T6040 blocks. */ -/delete-node/ &clk_200m; -/delete-node/ &sio; -/delete-node/ &ave0_dart1; -/delete-node/ &ave0_dart0; -/delete-node/ &apr0_dart; -/delete-node/ &usb4_0_dart; -/delete-node/ &apciec0_dart; -/delete-node/ &usb4_1_dart; -/delete-node/ &apciec1_dart; -/delete-node/ &usb4_2_dart; -/delete-node/ &apciec2_dart; -/delete-node/ &apcie1_dart; -/delete-node/ &sio_dart; -/delete-node/ &jpeg0; -/delete-node/ &jpeg1; -/delete-node/ &jpeg0_dart; -/delete-node/ &jpeg1_dart; -/delete-node/ &scaler0_dart; -/delete-node/ &usb4_0_mbox; -/delete-node/ &usb4_1_mbox; -/delete-node/ &usb4_2_mbox; -/delete-node/ &sio_mbox; -/delete-node/ &pinctrl_smc; -/delete-node/ &ps_gpx; -/delete-node/ &ps_apcie_gp; -/delete-node/ &ps_fab4_soc; -/delete-node/ &ps_sio_cpu; -/delete-node/ &ps_fpwm1; -/delete-node/ &ps_fpwm2; -/delete-node/ &ps_i2c0; -/delete-node/ &ps_i2c5; -/delete-node/ &ps_i2c7; -/delete-node/ &ps_uart_p; -/delete-node/ &ps_dpa_p; -/delete-node/ &ps_aes; -/delete-node/ &ps_spi0; -/delete-node/ &ps_spi1; -/delete-node/ &ps_spi3; -/delete-node/ &ps_spi4; -/delete-node/ &ps_spi5; -/delete-node/ &ps_qspi; -/delete-node/ &ps_uart_n; -/delete-node/ &ps_uart0; -/delete-node/ &ps_uart1; -/delete-node/ &ps_uart2; -/delete-node/ &ps_uart3; -/delete-node/ &ps_uart4; -/delete-node/ &ps_uart5; -/delete-node/ &ps_uart6; -/delete-node/ &ps_dpa0; -/delete-node/ &ps_dpa1; -/delete-node/ &ps_dpa2; -/delete-node/ &ps_dpa3; -/delete-node/ &ps_dpa4; -/delete-node/ &ps_disp_sys; -/delete-node/ &ps_amcc4; -/delete-node/ &ps_amcc5; -/delete-node/ &ps_amcc6; -/delete-node/ &ps_amcc7; -/delete-node/ &ps_amcc12; -/delete-node/ &ps_amcc13; -/delete-node/ &ps_amcc14; -/delete-node/ &ps_amcc15; -/delete-node/ &ps_dcs_04; -/delete-node/ &ps_dcs_05; -/delete-node/ &ps_dcs_06; -/delete-node/ &ps_dcs_07; -/delete-node/ &ps_dcs_12; -/delete-node/ &ps_dcs_13; -/delete-node/ &ps_dcs_14; -/delete-node/ &ps_dcs_15; -/delete-node/ &ps_disp_fe; -/delete-node/ &ps_apcie_sys_gp; -/delete-node/ &ps_apcie_phy_sw; -/delete-node/ &ps_jpg; -/delete-node/ &pmgr_disp; -/delete-node/ &ps_ecpu_0; -/delete-node/ &ps_ecpu_2; -/delete-node/ &ps_dwi; -/delete-node/ &ps_aic; -/delete-node/ &ps_pmc; -/delete-node/ &ps_pms_c1ppt; -/delete-node/ &ps_soc_dpe; -/delete-node/ &ps_pmgr_soc_ocla; -/delete-node/ &ps_pms_fpwm0; -/delete-node/ &ps_pms_fpwm1; -/delete-node/ &ps_pms_fpwm2; -/delete-node/ &ps_pms_fpwm3; -/delete-node/ &ps_pms_fpwm4; -/delete-node/ &ps_fab0_soc; -/delete-node/ &ps_ecpu_3; -/delete-node/ &ps_amcc0; -/delete-node/ &ps_dcs_00; -/delete-node/ &ps_rom; -/delete-node/ &ps_amcc1; -/delete-node/ &ps_dcs_01; -/delete-node/ &ps_amcc2; -/delete-node/ &ps_dcs_02; -/delete-node/ &ps_amcc3; -/delete-node/ &ps_dcs_03; -/delete-node/ &ps_amcc8; -/delete-node/ &ps_dcs_08; -/delete-node/ &ps_amcc9; -/delete-node/ &ps_dcs_09; -/delete-node/ &ps_amcc10; -/delete-node/ &ps_dcs_10; -/delete-node/ &ps_amcc11; -/delete-node/ &ps_pcpu0_0; -/delete-node/ &ps_dcs_11; -/delete-node/ &ps_venc0_sys; -/delete-node/ &ps_pcpu0_1; -/delete-node/ &ps_fab_gw_0; -/delete-node/ &ps_fab_gw_1; -/delete-node/ &ps_fab_afr; -/delete-node/ &ps_fab1_soc; -/delete-node/ &ps_pcpu0_2; -/delete-node/ &ps_scodec; -/delete-node/ &ps_scodec_streaming; -/delete-node/ &ps_fab2_soc; -/delete-node/ &ps_dispext0_sys; -/delete-node/ &ps_dispext0_fe; -/delete-node/ &ps_dispext0_cpu; -/delete-node/ &ps_pcpu0_3; -/delete-node/ &ps_atc0_cio; -/delete-node/ &ps_atc0_pcie; -/delete-node/ &ps_atc0_cio_pcie; -/delete-node/ &ps_atc0_cio_usb; -/delete-node/ &ps_atc1_cio; -/delete-node/ &ps_atc1_pcie; -/delete-node/ &ps_atc1_cio_pcie; -/delete-node/ &ps_atc1_cio_usb; -/delete-node/ &ps_atc2_cio; -/delete-node/ &ps_atc2_pcie; -/delete-node/ &ps_atc2_cio_pcie; -/delete-node/ &ps_pcpu0_4; -/delete-node/ &ps_atc2_cio_usb; -/delete-node/ &ps_atc3_cio; -/delete-node/ &ps_atc3_pcie; -/delete-node/ &ps_atc3_cio_pcie; -/delete-node/ &ps_atc3_cio_usb; -/delete-node/ &ps_fab5_soc; -/delete-node/ &ps_sbr; -/delete-node/ &ps_gpio; -/delete-node/ &ps_msg; -/delete-node/ &ps_ap_tmm; -/delete-node/ &ps_msr0; -/delete-node/ &ps_msr0_ase_core; -/delete-node/ &ps_pcpu0_5; -/delete-node/ &ps_fab7_soc; -/delete-node/ &ps_dispext1_sys; -/delete-node/ &ps_dispext1_fe; -/delete-node/ &ps_dispext1_cpu; -/delete-node/ &ps_pcpu1_0; -/delete-node/ &ps_pcpu1_1; -/delete-node/ &ps_pcpu1_2; -/delete-node/ &ps_pcpu1_3; -/delete-node/ &ps_pcpu1_4; -/delete-node/ &ps_pcpu1_5; -/delete-node/ &ps_ecpu_1; -/delete-node/ &ps_ecpm; -/delete-node/ &ps_pcpm0; -/delete-node/ &ps_pcpm1; -/delete-node/ &pmgr_venc; -/delete-node/ &ps_debug_gated; -/delete-node/ &ps_nub_fabric; -/delete-node/ &ps_nub_sram; -/delete-node/ &ps_debug_switch; -/delete-node/ &ps_nub_spmi_ahb; -/delete-node/ &ps_nub_spmi0; -/delete-node/ &ps_nub_spmi_a2; -/delete-node/ &ps_nub_spi0; -/delete-node/ &ps_nub_aon; -/delete-node/ &ps_nub_ocla; -/delete-node/ &ps_nub_spmi1; -/delete-node/ &ps_nub_spmi2; -/delete-node/ &ps_nub_spmi3; -/delete-node/ &ps_nub_spmi4; -/delete-node/ &dcuart; -/delete-node/ &spi4; -/delete-node/ &qspi; -/delete-node/ &nub_spmi1; -/delete-node/ &nub_spmi2; -/delete-node/ &nub_spmi3; -/delete-node/ &nub_spmi4; -/delete-node/ &aop_spmi0; -/delete-node/ &ave; - -/delete-node/ &aop_accel; -/delete-node/ &aop_gyro; -/delete-node/ &pmc_soc_max; -/delete-node/ &pmu_rtc; - -/ { - /delete-node/ pmu; -}; - &avd { compatible = "apple,t6041-max-avd", "apple,t6041-avd", "apple,t8132-avd"; power-domains = <&ps_avd_sys>; - /delete-property/ power-domain-names; }; /* @@ -213,8 +18,6 @@ * Abbey offsets (ADT info-rtc_alarm_*). */ &nub_spmi0 { - /delete-node/ pmic@e; - pmic@b { compatible = "apple,chapel-pmic", "apple,spmi-nvmem"; reg = <0xb SPMI_USID>; @@ -259,105 +62,6 @@ }; }; -&usb_drd0_dart_0 { - /delete-property/ apple,dma-range; -}; - -&usb_drd0_dart_1 { - /delete-property/ apple,dma-range; -}; - -&usb_drd1_dart_0 { - /delete-property/ apple,dma-range; -}; - -&usb_drd1_dart_1 { - /delete-property/ apple,dma-range; -}; - -&usb_drd2_dart_0 { - /delete-property/ apple,dma-range; -}; - -&usb_drd2_dart_1 { - /delete-property/ apple,dma-range; -}; - -&mtp_dart { - /delete-property/ apple,dma-range; -}; - -&{/opp-table-e/opp01} { - /delete-property/ opp-microwatt; -}; - -&{/opp-table-e/opp02} { - /delete-property/ opp-microwatt; -}; - -&{/opp-table-e/opp03} { - /delete-property/ opp-microwatt; -}; - -&{/opp-table-e/opp04} { - /delete-property/ opp-microwatt; -}; - -&{/opp-table-e/opp05} { - /delete-property/ opp-microwatt; -}; - -&{/opp-table-e/opp06} { - /delete-property/ opp-microwatt; -}; - -&{/opp-table-e/opp07} { - /delete-property/ opp-microwatt; -}; - -&ps_avd_sys { - /delete-property/ power-domains; -}; - -&ps_atc0_common { - /delete-property/ power-domains; -}; - -&ps_atc1_common { - /delete-property/ power-domains; -}; - -&ps_atc2_common { - /delete-property/ power-domains; -}; - -&ps_atc3_common { - /delete-property/ power-domains; -}; - -/* FAB4_SOC and FAB5_SOC are critical, on from iBoot and not described here. */ -&ps_ane_sys { - /delete-property/ power-domains; -}; - -&ps_pmp { - /delete-property/ power-domains; -}; - -&ps_pms_sram { - /delete-property/ power-domains; -}; - -&serial0 { - /delete-property/ power-domains; - /delete-property/ status; -}; - -/delete-node/ &gpu; -/delete-node/ &gfx_mbox; -/delete-node/ &opp_p0; -/delete-node/ &opp_p1; - / { opp_p0: opp-table-p0 { compatible = "operating-points-v2"; @@ -593,7 +297,6 @@ }; &pmc { - /delete-property/ apple,pmp; apple,static-voters = <1 3>; }; diff --git a/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi b/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi index 735df142bd0eb..f0a951fecd4c2 100644 --- a/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi @@ -297,7 +297,6 @@ #power-domain-cells = <0>; #reset-cells = <0>; label = "avd_sys"; - power-domains = <&ps_fab0_soc>; }; ps_afc: power-controller@178 { @@ -316,7 +315,6 @@ #reset-cells = <0>; label = "pmp"; apple,always-on; - power-domains = <&ps_pms>; }; ps_pms_sram: power-controller@418 { @@ -326,7 +324,6 @@ #reset-cells = <0>; label = "pms_sram"; apple,always-on; - power-domains = <&ps_pms>; }; ps_fab6_soc: power-controller@480 { @@ -361,7 +358,6 @@ #reset-cells = <0>; label = "atc0_common"; apple,always-on; - power-domains = <&ps_fab2_soc>; }; ps_atc1_common: power-controller@3b8 { @@ -371,7 +367,6 @@ #reset-cells = <0>; label = "atc1_common"; apple,always-on; - power-domains = <&ps_fab2_soc>; }; ps_atc2_common: power-controller@3e0 { @@ -381,7 +376,6 @@ #reset-cells = <0>; label = "atc2_common"; apple,always-on; - power-domains = <&ps_fab2_soc>; }; }; @@ -519,1421 +513,22 @@ * Enable the provider and its parents together with the consumer. */ &pmgr { - ps_apcie_gp: power-controller@100 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x100 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "apcie_gp"; - status = "disabled"; - }; - - ps_fab4_soc: power-controller@128 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x128 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab4_soc"; - power-domains = <&ps_afc>; - apple,always-on; - }; - - ps_sio_cpu: power-controller@130 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x130 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "sio_cpu"; - power-domains = <&ps_sio>; - apple,always-on; - status = "disabled"; - }; - - ps_fpwm1: power-controller@140 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x140 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fpwm1"; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - ps_fpwm2: power-controller@148 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x148 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fpwm2"; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - ps_i2c0: power-controller@150 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x150 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "i2c0"; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - ps_i2c5: power-controller@178 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x178 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "i2c5"; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - ps_i2c7: power-controller@188 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x188 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "i2c7"; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - - ps_uart_p: power-controller@1a0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1a0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart_p"; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - ps_dpa_p: power-controller@1a8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1a8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dpa_p"; - power-domains = <&ps_sio>; - apple,always-on; - status = "disabled"; - }; - - ps_aes: power-controller@1b0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1b0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "aes"; - power-domains = <&ps_sio>; - apple,always-on; - status = "disabled"; - }; - - ps_spi0: power-controller@1b8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1b8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "spi0"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - - ps_spi1: power-controller@1c0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1c0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "spi1"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - - - ps_spi3: power-controller@1d0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1d0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "spi3"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - - ps_spi4: power-controller@1d8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1d8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "spi4"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - - ps_spi5: power-controller@1e0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1e0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "spi5"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - - ps_qspi: power-controller@1e8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1e8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "qspi"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - - ps_uart_n: power-controller@1f0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1f0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart_n"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart0: power-controller@1f8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1f8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart0"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart1: power-controller@200 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x200 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart1"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart2: power-controller@208 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x208 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart2"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart3: power-controller@210 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x210 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart3"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart4: power-controller@218 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x218 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart4"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart5: power-controller@220 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x220 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart5"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_uart6: power-controller@228 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x228 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "uart6"; - power-domains = <&ps_uart_p>; - status = "disabled"; - }; - - ps_dpa0: power-controller@230 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x230 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dpa0"; - power-domains = <&ps_dpa_p>; - status = "disabled"; - }; - - ps_dpa1: power-controller@238 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x238 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dpa1"; - power-domains = <&ps_dpa_p>; - status = "disabled"; - }; - - ps_dpa2: power-controller@240 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x240 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dpa2"; - power-domains = <&ps_dpa_p>; - status = "disabled"; - }; - - ps_dpa3: power-controller@248 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x248 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dpa3"; - power-domains = <&ps_dpa_p>; - status = "disabled"; - }; - - ps_dpa4: power-controller@250 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x250 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dpa4"; - power-domains = <&ps_dpa_p>; - status = "disabled"; - }; - - ps_disp_sys: power-controller@258 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x258 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "disp_sys"; - power-domains = <&ps_fab6_soc>; - status = "disabled"; - }; - - ps_amcc4: power-controller@260 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x260 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc4"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc5: power-controller@268 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x268 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc5"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc6: power-controller@270 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x270 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc6"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc7: power-controller@278 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x278 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc7"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc12: power-controller@280 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x280 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc12"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc13: power-controller@288 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x288 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc13"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc14: power-controller@290 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x290 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc14"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc15: power-controller@298 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x298 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc15"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_04: power-controller@2e0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x2e0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_04"; - power-domains = <&ps_amcc4>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_05: power-controller@2e8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x2e8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_05"; - power-domains = <&ps_amcc5>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_06: power-controller@2f0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x2f0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_06"; - power-domains = <&ps_amcc6>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_07: power-controller@2f8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x2f8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_07"; - power-domains = <&ps_amcc7>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_12: power-controller@300 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x300 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_12"; - power-domains = <&ps_amcc12>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_13: power-controller@308 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x308 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_13"; - power-domains = <&ps_amcc13>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_14: power-controller@310 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x310 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_14"; - power-domains = <&ps_amcc14>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_15: power-controller@318 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x318 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_15"; - power-domains = <&ps_amcc15>; - apple,always-on; - status = "disabled"; - }; - - ps_disp_fe: power-controller@368 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x368 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "disp_fe"; - power-domains = <&ps_disp_sys>; - status = "disabled"; - }; - - ps_apcie_sys_gp: power-controller@390 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x390 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "apcie_sys_gp"; - power-domains = <&ps_fab3_soc>, <&ps_apcie_gp>; - status = "disabled"; - }; - - ps_apcie_phy_sw: power-controller@398 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x398 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "apcie_phy_sw"; - power-domains = <&ps_apcie_sys_st0>, <&ps_apcie_sys_st1>; - status = "disabled"; - }; - - ps_jpg: power-controller@3a0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3a0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "jpg"; - power-domains = <&ps_fab4_soc>; - status = "disabled"; - }; - - ps_ane_sys: power-controller@3c0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3c0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ane_sys"; - power-domains = <&ps_fab5_soc>, <&ps_fab4_soc>; - }; - -}; - -&pmgr_aux { - ps_ecpu_0: power-controller@0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ecpu_0"; - status = "disabled"; - }; - - ps_ecpu_1: power-controller@8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ecpu_1"; - status = "disabled"; - }; - - ps_ecpu_2: power-controller@10 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x10 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ecpu_2"; - status = "disabled"; - }; - - ps_ecpu_3: power-controller@18 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x18 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ecpu_3"; - status = "disabled"; - }; - - ps_pcpu0_0: power-controller@20 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x20 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu0_0"; - status = "disabled"; - }; - - ps_pcpu0_1: power-controller@28 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x28 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu0_1"; - status = "disabled"; - }; - - ps_pcpu0_2: power-controller@30 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x30 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu0_2"; - status = "disabled"; - }; - - ps_pcpu0_3: power-controller@38 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x38 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu0_3"; - status = "disabled"; - }; - - ps_pcpu0_4: power-controller@40 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x40 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu0_4"; - status = "disabled"; - }; - - ps_pcpu0_5: power-controller@48 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x48 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu0_5"; - status = "disabled"; - }; - - ps_pcpu1_0: power-controller@50 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x50 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu1_0"; - status = "disabled"; - }; - - ps_pcpu1_1: power-controller@58 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x58 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu1_1"; - status = "disabled"; - }; - - ps_pcpu1_2: power-controller@60 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x60 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu1_2"; - status = "disabled"; - }; - - ps_pcpu1_3: power-controller@68 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x68 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu1_3"; - status = "disabled"; - }; - - ps_pcpu1_4: power-controller@70 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x70 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu1_4"; - status = "disabled"; - }; - - ps_pcpu1_5: power-controller@78 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x78 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpu1_5"; - status = "disabled"; - }; - - ps_ecpm: power-controller@80 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x80 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ecpm"; - status = "disabled"; - }; - - ps_pcpm0: power-controller@88 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x88 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpm0"; - status = "disabled"; - }; - - ps_pcpm1: power-controller@90 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x90 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pcpm1"; - status = "disabled"; - }; - - ps_dwi: power-controller@108 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x108 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dwi"; - status = "disabled"; - }; - - ps_aic: power-controller@118 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x118 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "aic"; - power-domains = <&ps_pms>; - status = "disabled"; - }; - - ps_pmc: power-controller@120 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x120 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pmc"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_pms_c1ppt: power-controller@128 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x128 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pms_c1ppt"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_soc_dpe: power-controller@130 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x130 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "soc_dpe"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_pmgr_soc_ocla: power-controller@138 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x138 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pmgr_soc_ocla"; - status = "disabled"; - }; - - ps_pms_fpwm0: power-controller@140 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x140 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pms_fpwm0"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_pms_fpwm1: power-controller@148 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x148 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pms_fpwm1"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_pms_fpwm2: power-controller@150 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x150 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pms_fpwm2"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_pms_fpwm3: power-controller@158 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x158 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pms_fpwm3"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_pms_fpwm4: power-controller@160 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x160 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "pms_fpwm4"; - power-domains = <&ps_pms>; - apple,always-on; - status = "disabled"; - }; - - ps_fab0_soc: power-controller@168 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x168 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab0_soc"; - power-domains = <&ps_afi>; - apple,always-on; - }; - - ps_amcc0: power-controller@180 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x180 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc0"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_00: power-controller@188 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x188 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_00"; - power-domains = <&ps_amcc0>; - apple,always-on; - status = "disabled"; - }; - - ps_rom: power-controller@190 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x190 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "rom"; - power-domains = <&ps_amcc0>; - status = "disabled"; - }; - - ps_amcc1: power-controller@198 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x198 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc1"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_01: power-controller@1a0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1a0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_01"; - power-domains = <&ps_amcc1>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc2: power-controller@1a8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1a8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc2"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_02: power-controller@1b0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1b0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_02"; - power-domains = <&ps_amcc2>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc3: power-controller@1b8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1b8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc3"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_03: power-controller@1c0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1c0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_03"; - power-domains = <&ps_amcc3>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc8: power-controller@1c8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1c8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc8"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_08: power-controller@1d0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1d0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_08"; - power-domains = <&ps_amcc8>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc9: power-controller@1d8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1d8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc9"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_09: power-controller@1e0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1e0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_09"; - power-domains = <&ps_amcc9>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc10: power-controller@1e8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1e8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc10"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_10: power-controller@1f0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1f0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_10"; - power-domains = <&ps_amcc10>; - apple,always-on; - status = "disabled"; - }; - - ps_amcc11: power-controller@1f8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1f8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "amcc11"; - power-domains = <&ps_afc>; - apple,always-on; - status = "disabled"; - }; - - ps_dcs_11: power-controller@200 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x200 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dcs_11"; - power-domains = <&ps_amcc11>; - apple,always-on; - status = "disabled"; - }; - - ps_venc0_sys: power-controller@278 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x278 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_sys"; - power-domains = <&ps_fab0_soc>; - status = "disabled"; - }; - - ps_fab_gw_0: power-controller@288 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x288 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab_gw_0"; - apple,always-on; - status = "disabled"; - }; - - ps_fab_gw_1: power-controller@290 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x290 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab_gw_1"; - apple,always-on; - status = "disabled"; - }; - - ps_fab_afr: power-controller@298 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x298 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab_afr"; - apple,always-on; - status = "disabled"; - }; - - ps_fab1_soc: power-controller@2d0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x2d0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab1_soc"; - power-domains = <&ps_afi>; - apple,always-on; - status = "disabled"; - }; - - ps_scodec: power-controller@328 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x328 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "scodec"; - power-domains = <&ps_fab1_soc>; - status = "disabled"; - }; - - ps_scodec_streaming: power-controller@330 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x330 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "scodec_streaming"; - power-domains = <&ps_scodec>; - status = "disabled"; - }; - - ps_fab2_soc: power-controller@338 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x338 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab2_soc"; - power-domains = <&ps_afi>; - apple,always-on; - }; - - ps_dispext0_sys: power-controller@340 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x340 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dispext0_sys"; - power-domains = <&ps_fab2_soc>; - status = "disabled"; - }; - - ps_dispext0_fe: power-controller@348 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x348 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dispext0_fe"; - power-domains = <&ps_dispext0_sys>; - status = "disabled"; - }; - - ps_dispext0_cpu: power-controller@350 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x350 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dispext0_cpu"; - power-domains = <&ps_dispext0_fe>; - status = "disabled"; - }; - - ps_atc0_cio: power-controller@398 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x398 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc0_cio"; - power-domains = <&ps_atc0_common>; - status = "disabled"; - }; - - ps_atc0_pcie: power-controller@3a0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3a0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc0_pcie"; - power-domains = <&ps_atc0_common>; - status = "disabled"; - }; - - ps_atc0_cio_pcie: power-controller@3a8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3a8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc0_cio_pcie"; - power-domains = <&ps_atc0_cio>; - status = "disabled"; - }; - - ps_atc0_cio_usb: power-controller@3b0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3b0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc0_cio_usb"; - power-domains = <&ps_atc0_cio>; - status = "disabled"; - }; - - ps_atc1_cio: power-controller@3c0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3c0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc1_cio"; - power-domains = <&ps_atc1_common>; - status = "disabled"; - }; - - ps_atc1_pcie: power-controller@3c8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3c8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc1_pcie"; - power-domains = <&ps_atc1_common>; - status = "disabled"; - }; - - ps_atc1_cio_pcie: power-controller@3d0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3d0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc1_cio_pcie"; - power-domains = <&ps_atc1_cio>; - status = "disabled"; - }; - - ps_atc1_cio_usb: power-controller@3d8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3d8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc1_cio_usb"; - power-domains = <&ps_atc1_cio>; - status = "disabled"; - }; - - ps_atc2_cio: power-controller@3e8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3e8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc2_cio"; - power-domains = <&ps_atc2_common>; - status = "disabled"; - }; - - ps_atc2_pcie: power-controller@3f0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3f0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc2_pcie"; - power-domains = <&ps_atc2_common>; - status = "disabled"; - }; - - ps_atc2_cio_pcie: power-controller@3f8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3f8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc2_cio_pcie"; - power-domains = <&ps_atc2_cio>; - status = "disabled"; - }; - - ps_atc2_cio_usb: power-controller@400 { + ps_ane_sys: power-controller@3c0 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x400 4>; + reg = <0x3c0 4>; #power-domain-cells = <0>; #reset-cells = <0>; - label = "atc2_cio_usb"; - power-domains = <&ps_atc2_cio>; - status = "disabled"; + label = "ane_sys"; }; +}; +&pmgr_aux { ps_atc3_common: power-controller@408 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x408 4>; #power-domain-cells = <0>; #reset-cells = <0>; label = "atc3_common"; - power-domains = <&ps_fab2_soc>; - status = "disabled"; - }; - - ps_atc3_cio: power-controller@420 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x420 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc3_cio"; - power-domains = <&ps_atc3_common>; - status = "disabled"; - }; - - ps_atc3_pcie: power-controller@428 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x428 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc3_pcie"; - power-domains = <&ps_atc3_common>; - status = "disabled"; - }; - - ps_atc3_cio_pcie: power-controller@430 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x430 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc3_cio_pcie"; - power-domains = <&ps_atc3_cio>; - status = "disabled"; - }; - - ps_atc3_cio_usb: power-controller@438 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x438 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "atc3_cio_usb"; - power-domains = <&ps_atc3_cio>; - status = "disabled"; - }; - - ps_fab5_soc: power-controller@440 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x440 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab5_soc"; - power-domains = <&ps_afi>; - apple,always-on; - }; - - ps_sbr: power-controller@448 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x448 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "sbr"; - power-domains = <&ps_fab5_soc>; - apple,always-on; - status = "disabled"; - }; - - ps_gpio: power-controller@450 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x450 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "gpio"; - power-domains = <&ps_sbr>; - status = "disabled"; - }; - - ps_msg: power-controller@458 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x458 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "msg"; - power-domains = <&ps_sbr>; - status = "disabled"; - }; - - ps_ap_tmm: power-controller@468 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x468 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "ap_tmm"; - power-domains = <&ps_sbr>; - status = "disabled"; - }; - - ps_msr0: power-controller@470 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x470 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "msr0"; - power-domains = <&ps_fab5_soc>; - status = "disabled"; - }; - - ps_msr0_ase_core: power-controller@478 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x478 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "msr0_ase_core"; - power-domains = <&ps_msr0>; - status = "disabled"; - }; - - ps_fab7_soc: power-controller@488 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x488 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab7_soc"; - power-domains = <&ps_afi>; - apple,always-on; - status = "disabled"; - }; - - ps_dispext1_sys: power-controller@490 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x490 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dispext1_sys"; - power-domains = <&ps_fab7_soc>; - status = "disabled"; - }; - - ps_dispext1_fe: power-controller@498 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x498 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dispext1_fe"; - power-domains = <&ps_dispext1_sys>; - status = "disabled"; - }; - - ps_dispext1_cpu: power-controller@4a0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x4a0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "dispext1_cpu"; - power-domains = <&ps_dispext1_fe>; status = "disabled"; }; }; @@ -1977,77 +572,6 @@ }; &pmgr_mini { - ps_debug_gated: power-controller@0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "debug_gated"; - apple,always-on; - status = "disabled"; - }; - - ps_nub_spmi_ahb: power-controller@58 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x58 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi_ahb"; - apple,always-on; - status = "disabled"; - }; - - ps_nub_spmi0: power-controller@60 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x60 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi0"; - power-domains = <&ps_nub_spmi_ahb>; - apple,always-on; - status = "disabled"; - }; - - ps_nub_spmi_a2: power-controller@78 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x78 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi_a2"; - apple,always-on; - status = "disabled"; - }; - - ps_nub_spi0: power-controller@80 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x80 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spi0"; - apple,always-on; - status = "disabled"; - }; - - ps_nub_aon: power-controller@88 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x88 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_aon"; - apple,always-on; - status = "disabled"; - }; - - ps_nub_ocla: power-controller@98 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x98 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_ocla"; - apple,always-on; - status = "disabled"; - }; - ps_atc3_common_dp: power-controller@b8 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0xb8 4>; @@ -2057,17 +581,6 @@ status = "disabled"; }; - ps_nub_spmi1: power-controller@c0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0xc0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi1"; - power-domains = <&ps_nub_spmi_ahb>; - apple,always-on; - status = "disabled"; - }; - ps_atc3_usb_aon: power-controller@e0 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0xe0 4>; @@ -2077,70 +590,6 @@ status = "disabled"; }; - ps_nub_spmi2: power-controller@e8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0xe8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi2"; - power-domains = <&ps_nub_spmi_ahb>; - apple,always-on; - status = "disabled"; - }; - - ps_nub_spmi3: power-controller@f0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0xf0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi3"; - power-domains = <&ps_nub_spmi_ahb>; - apple,always-on; - status = "disabled"; - }; - - ps_nub_spmi4: power-controller@f8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0xf8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_spmi4"; - power-domains = <&ps_nub_spmi_ahb>; - apple,always-on; - status = "disabled"; - }; - - ps_nub_fabric: power-controller@100 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x100 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_fabric"; - apple,always-on; - status = "disabled"; - }; - - ps_nub_sram: power-controller@108 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x108 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "nub_sram"; - power-domains = <&ps_nub_fabric>; - apple,always-on; - status = "disabled"; - }; - - ps_debug_switch: power-controller@110 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x110 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "debug_switch"; - apple,always-on; - status = "disabled"; - }; - ps_atc3_usb: power-controller@148 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x148 4>; @@ -2161,79 +610,3 @@ status = "disabled"; }; }; - -&pmgr_disp { - ps_disp_cpu: power-controller@0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "disp_cpu"; - power-domains = <&ps_disp_fe>; - status = "disabled"; - }; -}; - -&pmgr_gfx { - ps_gpx: power-controller@0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "gpx"; - apple,always-on; - status = "disabled"; - }; -}; - -&pmgr_venc { - ps_venc0_dma: power-controller@0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_dma"; - power-domains = <&ps_venc0_sys>; - status = "disabled"; - }; - - ps_venc0_pipe4: power-controller@8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_pipe4"; - power-domains = <&ps_venc0_dma>; - status = "disabled"; - }; - - ps_venc0_pipe5: power-controller@10 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x10 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_pipe5"; - power-domains = <&ps_venc0_dma>; - status = "disabled"; - }; - - ps_venc0_me0: power-controller@18 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x18 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_me0"; - power-domains = <&ps_venc0_dma>; - status = "disabled"; - }; - - ps_venc0_me1: power-controller@20 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x20 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_me1"; - power-domains = <&ps_venc0_me0>; - status = "disabled"; - }; -}; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index 091adfdfda6df..c4dab65b6ab74 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -347,239 +347,30 @@ opp01 { opp-hz = /bits/ 64 <1020000000>; opp-level = <1>; - opp-microwatt = <81900>; }; opp02 { opp-hz = /bits/ 64 <1404000000>; opp-level = <2>; - opp-microwatt = <133100>; }; opp03 { opp-hz = /bits/ 64 <1788000000>; opp-level = <3>; - opp-microwatt = <209400>; }; opp04 { opp-hz = /bits/ 64 <2112000000>; opp-level = <4>; - opp-microwatt = <301400>; }; opp05 { opp-hz = /bits/ 64 <2352000000>; opp-level = <5>; - opp-microwatt = <383900>; }; opp06 { opp-hz = /bits/ 64 <2532000000>; opp-level = <6>; - opp-microwatt = <478500>; }; opp07 { opp-hz = /bits/ 64 <2592000000>; opp-level = <7>; - opp-microwatt = <531000>; - }; - }; - - opp_p0: opp-table-p0 { - compatible = "operating-points-v2"; - opp-shared; - - opp01 { - opp-hz = /bits/ 64 <1260000000>; - opp-level = <1>; - opp-microwatt = <513000>; - }; - opp02 { - opp-hz = /bits/ 64 <1512000000>; - opp-level = <2>; - opp-microwatt = <715000>; - }; - opp03 { - opp-hz = /bits/ 64 <1800000000>; - opp-level = <3>; - opp-microwatt = <907500>; - }; - opp04 { - opp-hz = /bits/ 64 <2088000000>; - opp-level = <4>; - opp-microwatt = <1158200>; - }; - opp05 { - opp-hz = /bits/ 64 <2352000000>; - opp-level = <5>; - opp-microwatt = <1494500>; - }; - opp06 { - opp-hz = /bits/ 64 <2616000000>; - opp-level = <6>; - opp-microwatt = <1782600>; - }; - opp07 { - opp-hz = /bits/ 64 <2868000000>; - opp-level = <7>; - opp-microwatt = <2209600>; - }; - opp08 { - opp-hz = /bits/ 64 <3096000000>; - opp-level = <8>; - opp-microwatt = <2636700>; - }; - opp09 { - opp-hz = /bits/ 64 <3300000000>; - opp-level = <9>; - opp-microwatt = <3247200>; - }; - opp10 { - opp-hz = /bits/ 64 <3468000000>; - opp-level = <10>; - opp-microwatt = <3668700>; - }; - opp11 { - opp-hz = /bits/ 64 <3624000000>; - opp-level = <11>; - opp-microwatt = <4128200>; - }; - opp12 { - opp-hz = /bits/ 64 <3756000000>; - opp-level = <12>; - opp-microwatt = <4819300>; - }; - opp13 { - opp-hz = /bits/ 64 <3852000000>; - opp-level = <13>; - opp-microwatt = <4977700>; - }; - opp14 { - opp-hz = /bits/ 64 <3924000000>; - opp-level = <14>; - opp-microwatt = <5315900>; - }; - opp15 { - opp-hz = /bits/ 64 <3996000000>; - opp-level = <15>; - opp-microwatt = <5575900>; - }; - opp16 { - opp-hz = /bits/ 64 <4044000000>; - opp-level = <16>; - opp-microwatt = <5773400>; - }; - opp17 { - opp-hz = /bits/ 64 <4104000000>; - opp-level = <17>; - opp-microwatt = <5969200>; - }; - opp18 { - opp-hz = /bits/ 64 <4416000000>; - opp-level = <18>; - opp-microwatt = <8274900>; - }; - opp19 { - opp-hz = /bits/ 64 <4512000000>; - opp-level = <19>; - opp-microwatt = <9256900>; - }; - }; - - opp_p1: opp-table-p1 { - compatible = "operating-points-v2"; - opp-shared; - - opp01 { - opp-hz = /bits/ 64 <1260000000>; - opp-level = <1>; - opp-microwatt = <561800>; - }; - opp02 { - opp-hz = /bits/ 64 <1512000000>; - opp-level = <2>; - opp-microwatt = <772500>; - }; - opp03 { - opp-hz = /bits/ 64 <1800000000>; - opp-level = <3>; - opp-microwatt = <988900>; - }; - opp04 { - opp-hz = /bits/ 64 <2088000000>; - opp-level = <4>; - opp-microwatt = <1302300>; - }; - opp05 { - opp-hz = /bits/ 64 <2352000000>; - opp-level = <5>; - opp-microwatt = <1644100>; - }; - opp06 { - opp-hz = /bits/ 64 <2616000000>; - opp-level = <6>; - opp-microwatt = <2003700>; - }; - opp07 { - opp-hz = /bits/ 64 <2868000000>; - opp-level = <7>; - opp-microwatt = <2349000>; - }; - opp08 { - opp-hz = /bits/ 64 <3096000000>; - opp-level = <8>; - opp-microwatt = <2723000>; - }; - opp09 { - opp-hz = /bits/ 64 <3300000000>; - opp-level = <9>; - opp-microwatt = <3333200>; - }; - opp10 { - opp-hz = /bits/ 64 <3468000000>; - opp-level = <10>; - opp-microwatt = <3711900>; - }; - opp11 { - opp-hz = /bits/ 64 <3624000000>; - opp-level = <11>; - opp-microwatt = <4129900>; - }; - opp12 { - opp-hz = /bits/ 64 <3756000000>; - opp-level = <12>; - opp-microwatt = <4666300>; - }; - opp13 { - opp-hz = /bits/ 64 <3852000000>; - opp-level = <13>; - opp-microwatt = <4881000>; - }; - opp14 { - opp-hz = /bits/ 64 <3924000000>; - opp-level = <14>; - opp-microwatt = <5176700>; - }; - opp15 { - opp-hz = /bits/ 64 <3996000000>; - opp-level = <15>; - opp-microwatt = <5306500>; - }; - opp16 { - opp-hz = /bits/ 64 <4044000000>; - opp-level = <16>; - opp-microwatt = <5618900>; - }; - opp17 { - opp-hz = /bits/ 64 <4104000000>; - opp-level = <17>; - opp-microwatt = <5843100>; - }; - opp18 { - opp-hz = /bits/ 64 <4416000000>; - opp-level = <18>; - opp-microwatt = <8075300>; - }; - opp19 { - opp-hz = /bits/ 64 <4512000000>; - opp-level = <19>; - opp-microwatt = <8949200>; }; }; @@ -593,13 +384,6 @@ ; }; - pmu { - compatible = "apple,t6040-pmu"; - interrupt-parent = <&aic>; - /* The AIC raises both clusters' PMU FIQs as this one. */ - interrupts = ; - }; - /* The 24 MHz reference clock (ADT clock-ids 4) of the I2C, PWM and watchdog blocks */ clkref: clock-ref { compatible = "fixed-clock"; @@ -832,8 +616,6 @@ interrupt-parent = <&aic>; interrupts = , ; - power-domains = <&ps_avd_sys>, <&pmc_soc_max>; - power-domain-names = "core", "perf"; resets = <&ps_avd_sys>; iommus = <&avd_dart 0>; }; @@ -847,18 +629,6 @@ power-domains = <&ps_avd_sys>; }; - /* Named after its sgx range: the coprocessor range is the mailbox node's too. */ - gpu: gpu@288000000 { - compatible = "apple,agx-t6040"; - reg = <0x2 0x8a600000 0x0 0x88000>, - <0x2 0x88000000 0x0 0x3758000>; - reg-names = "asc", "sgx"; - mboxes = <&gfx_mbox>; - power-domains = <&pmp_gfx>; - apple,clpc = <&clpc>; - status = "disabled"; - }; - pmgr_gfx: power-management@288e80000 { compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; #address-cells = <1>; @@ -867,21 +637,6 @@ /* child nodes are added in t604x-pmgr.dtsi */ }; - gfx_mbox: mailbox@28a600000 { - compatible = "apple,t6040-ascwrap-v6"; - reg = <0x2 0x8a600000 0x0 0x88000>, - <0x2 0x8a050000 0x0 0x8>; - reg-names = "wrapper", "iop-vbar"; - interrupt-parent = <&aic>; - interrupts = , - ; - interrupt-names = "send-empty", "recv-not-empty"; - apple,firmware-role = "GFX"; - power-domains = <&ps_gfx>; - #mbox-cells = <0>; - status = "disabled"; - }; - disp0_dart: iommu@402300000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x4 0x02300000 0x0 0xc000>; @@ -1275,20 +1030,6 @@ #size-cells = <1>; }; - pmgr_disp: power-management@502290000 { - compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; - reg = <0x5 0x02290000 0x0 0x4000>; - #address-cells = <1>; - #size-cells = <1>; - }; - - pmgr_venc: power-management@502808000 { - compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; - reg = <0x5 0x02808000 0x0 0x4000>; - #address-cells = <1>; - #size-cells = <1>; - }; - pmgr_isp: power-management@502284000 { compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; #address-cells = <1>; @@ -1347,25 +1088,12 @@ nonposted-mmio; #address-cells = <1>; #size-cells = <0>; - apple,pmp = <&pmp>; apple,static-voters = <0 1 3>; status = "disabled"; clpc: performance-controller@1 { compatible = "apple,t6041-clpc"; reg = <1>; - - }; - - /* - * The SoC rail at its highest state. The video encoder runs on - * the fabric clock and encodes at less than half speed below it. - */ - pmc_soc_max: floor-soc-max { - label = "soc-max"; - #power-domain-cells = <0>; - apple,rail = <1>; - apple,level = <2>; }; }; @@ -1426,49 +1154,6 @@ interrupt-parent = <&aic>; interrupts = ; status = "disabled"; - - pmic@e { - compatible = "apple,abbey-pmic", "apple,spmi-nvmem"; - reg = <0xe SPMI_USID>; - - pmu_rtc: rtc { - compatible = "apple,t6041-pmu-rtc"; - interrupt-parent = <&nub_spmi0>; - interrupts = <2 IRQ_TYPE_EDGE_RISING>; - nvmem-cells = <&rtc_offset>; - nvmem-cell-names = "rtc_offset"; - wakeup-source; - }; - - nvmem-layout { - compatible = "fixed-layout"; - #address-cells = <1>; - #size-cells = <1>; - - rtc_offset: rtc-offset@2100 { - reg = <0x2100 0x6>; - }; - - boot_stage: boot-stage@f801 { - reg = <0xf801 0x1>; - }; - - boot_error_count: boot-error-count@f802,0 { - reg = <0xf802 0x1>; - bits = <0 4>; - }; - - panic_count: panic-count@f802,4 { - reg = <0xf802 0x1>; - bits = <4 4>; - }; - - shutdown_flag: shutdown-flag@f80f,3 { - reg = <0xf80f 0x1>; - bits = <3 1>; - }; - }; - }; }; smc: smc@50c600000 { @@ -1557,15 +1242,6 @@ aop_las: las { compatible = "apple,t6041-aop-las", "apple,aop-las"; }; - - /* The calibration properties come from the bootloader. */ - aop_accel: accel { - compatible = "apple,t6041-aop-accel", "apple,aop-accel"; - }; - - aop_gyro: gyro { - compatible = "apple,t6041-aop-gyro", "apple,aop-gyro"; - }; }; /* ADT lists the interrupts as 1, 0, 3, 2 of the block: send-empty is the lowest. */ @@ -1648,7 +1324,6 @@ interrupt-parent = <&aic>; interrupts = ; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; /* ADT "remap": streams 1 2 3 are stream 0 */ apple,remap-streams = <1 0>, <2 0>, <3 0>; status = "disabled"; @@ -1879,7 +1554,6 @@ interrupts = ; power-domains = <&ps_atc0_usb>; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; status = "disabled"; }; @@ -1890,7 +1564,6 @@ interrupts = ; power-domains = <&ps_atc0_usb>; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; status = "disabled"; }; @@ -1965,7 +1638,6 @@ interrupts = ; power-domains = <&ps_atc1_usb>; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; status = "disabled"; }; @@ -1976,7 +1648,6 @@ interrupts = ; power-domains = <&ps_atc1_usb>; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; status = "disabled"; }; @@ -2051,7 +1722,6 @@ interrupts = ; power-domains = <&ps_atc2_usb>; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; status = "disabled"; }; @@ -2062,7 +1732,6 @@ interrupts = ; power-domains = <&ps_atc2_usb>; #iommu-cells = <1>; - apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; status = "disabled"; }; @@ -2089,66 +1758,6 @@ phy-names = "usb2-phy", "usb3-phy"; status = "disabled"; }; - /* Additional DARTs; enabled together with their DMA consumers. */ - ave0_dart1: iommu@283080000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x2 0x83080000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_venc0_sys>; - status = "disabled"; - }; - - ave0_dart0: iommu@2830a0000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x2 0x830a0000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_venc0_sys>; - status = "disabled"; - }; - - apr0_dart: iommu@301020000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x01020000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_scodec>; - status = "disabled"; - }; - - apciec0_dart: iommu@384000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x84000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - apciec1_dart: iommu@38c000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x8c000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - apciec2_dart: iommu@394000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x94000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; dispext0_dart: iommu@3a2300000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; @@ -2170,26 +1779,6 @@ status = "disabled"; }; - apcie1_dart: iommu@411000000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x11000000 0x0 0x20000>; - #iommu-cells = <1>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - sio_dart: iommu@429060000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x29060000 0x0 0x20000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x1c000 0x2ff 0xfffe4000>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_sio>; - status = "disabled"; - }; - ane0_dart0: iommu@485800000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x4 0x85800000 0x0 0xc000>; @@ -2226,61 +1815,6 @@ status = "disabled"; }; - jpeg0: jpeg@487000000 { - compatible = "apple,t6041-jpeg"; - reg = <0x4 0x87000000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = ; - iommus = <&jpeg0_dart 0>; - power-domains = <&ps_jpg>; - apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; - status = "disabled"; - }; - - jpeg0_dart: iommu@487020000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x87020000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_jpg>; - status = "disabled"; - }; - - jpeg1: jpeg@487060000 { - compatible = "apple,t6041-jpeg"; - reg = <0x4 0x87060000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = ; - iommus = <&jpeg1_dart 0>; - power-domains = <&ps_jpg>; - apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; - status = "disabled"; - }; - - jpeg1_dart: iommu@487080000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x87080000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_jpg>; - status = "disabled"; - }; - - scaler0_dart: iommu@521260000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x5 0x21260000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_msr0>; - status = "disabled"; - }; - dispext1_dart: iommu@602300000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x6 0x02300000 0x0 0xc000>; @@ -2323,137 +1857,6 @@ status = "disabled"; }; - pinctrl_smc: pinctrl@50c824000 { - compatible = "apple,t6041-pinctrl", "apple,t8103-pinctrl"; - reg = <0x5 0x0c824000 0x0 0x4000>; - clocks = <&clkref>; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pinctrl_smc 0 0 24>; - apple,npins = <24>; - interrupt-controller; - #interrupt-cells = <2>; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - , - , - ; - /* Coprocessor pins and interrupt groups need an ownership handoff. */ - status = "disabled"; - }; - - nub_spmi1: spmi@509054000 { - compatible = "apple,t6041-spmi", "apple,t8103-spmi"; - reg = <0x5 0x09054000 0x0 0x100>; - #address-cells = <2>; - #size-cells = <0>; - power-domains = <&ps_nub_spmi1>; - status = "disabled"; - }; - - nub_spmi2: spmi@509094000 { - compatible = "apple,t6041-spmi", "apple,t8103-spmi"; - reg = <0x5 0x09094000 0x0 0x100>; - #address-cells = <2>; - #size-cells = <0>; - power-domains = <&ps_nub_spmi2>; - status = "disabled"; - }; - - nub_spmi3: spmi@5090d4000 { - compatible = "apple,t6041-spmi", "apple,t8103-spmi"; - reg = <0x5 0x090d4000 0x0 0x100>; - #address-cells = <2>; - #size-cells = <0>; - power-domains = <&ps_nub_spmi3>; - status = "disabled"; - }; - - nub_spmi4: spmi@509114000 { - compatible = "apple,t6041-spmi", "apple,t8103-spmi"; - reg = <0x5 0x09114000 0x0 0x100>; - #address-cells = <2>; - #size-cells = <0>; - power-domains = <&ps_nub_spmi4>; - status = "disabled"; - }; - - aop_spmi0: spmi@510914000 { - compatible = "apple,t6041-spmi", "apple,t8103-spmi"; - reg = <0x5 0x10914000 0x0 0x100>; - #address-cells = <2>; - #size-cells = <0>; - #interrupt-cells = <2>; - interrupt-controller; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - /* The QSPIMC input is ADT clock 434 (200 MHz). */ - clk_200m: clock-200m { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <200000000>; - clock-output-names = "clk_200m"; - }; - - spi4: spi@429110000 { - compatible = "apple,t6041-spi", "apple,t8103-spi"; - reg = <0x4 0x29110000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = ; - clocks = <&clkref>; - power-domains = <&ps_spi4>; - #address-cells = <1>; - #size-cells = <0>; - /* Panel/TCON control belongs to the display firmware. */ - status = "disabled"; - }; - - qspi: spi@429118000 { - compatible = "apple,t6041-qspi"; - reg = <0x4 0x29118000 0x0 0x4800>; - interrupt-parent = <&aic>; - interrupts = ; - clocks = <&clk_200m>; - power-domains = <&ps_qspi>; - #address-cells = <1>; - #size-cells = <0>; - /* Boards enable it with their flash and its nvram partition. */ - status = "disabled"; - }; - - /* The loader supplies the SIO firmware regions and protocol tables. */ - sio: dma-controller@429e00000 { - compatible = "apple,t6041-sio"; - reg = <0x4 0x29e00000 0x0 0x8000>; - dma-channels = <128>; - #dma-cells = <1>; - mboxes = <&sio_mbox>; - iommus = <&sio_dart 0>; - power-domains = <&ps_sio_cpu>; - status = "disabled"; - }; - - sio_mbox: mailbox@429e08000 { - compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x4 0x29e08000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - #mbox-cells = <0>; - power-domains = <&ps_sio_cpu>; - status = "disabled"; - }; - /* * Disabled until the H16 firmware path is proven on hardware. The * loader fills the preload reservations and the firmware IOVAs from @@ -2490,27 +1893,6 @@ status = "disabled"; }; - /* The video encoder stays disabled until its firmware backend is available. */ - ave: video-codec@283100000 { - compatible = "apple,t6041-ave"; - reg = <0x2 0x83100000 0x0 0x45c000>, - <0x2 0x83050000 0x0 0x4000>, - <0x2 0x83800000 0x0 0x800000>; - reg-names = "codec", "mailbox", "coproc"; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - ; - power-domains = <&ps_venc0_dma>, <&ps_venc0_pipe4>, - <&ps_venc0_pipe5>, <&ps_venc0_me0>, <&ps_venc0_me1>, - <&pmc_soc_max>; - power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1", "perf"; - iommus = <&ave0_dart0 0>, <&ave0_dart1 0>; - status = "disabled"; - }; - serial0: serial@429200000 { compatible = "apple,s5l-uart"; reg = <0x4 0x29200000 0x0 0x4000>; @@ -2519,101 +1901,7 @@ interrupts = ; clocks = <&clkref>, <&clkref>; clock-names = "uart", "clk_uart_baud0"; - power-domains = <&ps_uart0>; - status = "disabled"; - }; - - dcuart: serial@50883c000 { - compatible = "apple,dockchannel-uart"; - reg = <0x5 0x0883c000 0x0 0x4000>, - <0x5 0x08838000 0x0 0x4000>, - <0x5 0x0880c000 0x0 0x4000>; - reg-names = "data", "config", "irq"; - interrupt-parent = <&aic>; - interrupts = ; - apple,channel = <2>; - apple,sw-drain; - status = "disabled"; }; - - /* ACIO 0 remains disabled until its host-router handoff is supported. */ - usb4_0_mbox: mailbox@381108000 { - compatible = "apple,t6041-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>; - power-domains = <&ps_atc0_cio>; - status = "disabled"; - }; - - usb4_0_dart: iommu@381a80000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x81a80000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - /* ACIO 1 remains disabled until its host-router handoff is supported. */ - usb4_1_mbox: mailbox@389108000 { - compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x3 0x89108000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - #mbox-cells = <0>; - power-domains = <&ps_atc1_cio>; - status = "disabled"; - }; - - usb4_1_dart: iommu@389a80000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x89a80000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - - /* ACIO 2 remains disabled until its host-router handoff is supported. */ - usb4_2_mbox: mailbox@391108000 { - compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x3 0x91108000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - #mbox-cells = <0>; - power-domains = <&ps_atc2_cio>; - status = "disabled"; - }; - - usb4_2_dart: iommu@391a80000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x3 0x91a80000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - status = "disabled"; - }; - }; #include "t604x-pmgr.dtsi" From e47365e19249aea63245802b8b88a1d352de91e5 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:36:37 -0500 Subject: [PATCH 07/17] arm64: dts: apple: t6041: describe the PMU, JPEG, AVE, SIO and QSPI The T6041 tree left out the CPU PMU, both JPEG engines, the first video encoder (AVE0), the SIO coprocessor and the QSPI controller, although they have drivers and the J616c ADT lists them: sio, dart-sio, qspi, ave0, dart-ave0, jpeg0, jpeg1 and their DARTs have the same registers and interrupts as in the J773s (T6040) ADT. The CPUs are the T6040's, which apple_m1_cpu_pmu supports. Move these blocks and their power domains from the T6040 files to t604x.dtsi and t604x-pmgr.dtsi. As on the T6040, the devices and their domains stay disabled until a board enables them. The fabric parents of ps_jpg and ps_venc0_sys, and the AVE's PMC performance floor, stay T6040-only: the T6041 tree does not describe them, as for the AVD. The J575c, J614c and J616c dtbs gain 23 nodes. Only three are enabled: the CPU PMU, the 200 MHz QSPI reference clock and the VENC PMGR syscon, whose domains are disabled. The T6040 and T8132 dtbs do not change (identical under dtc -s apart from phandle numbers, or byte-identical). Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t6040-pmgr.dtsi | 101 ++----------- arch/arm64/boot/dts/apple/t6040.dtsi | 168 +--------------------- arch/arm64/boot/dts/apple/t604x-pmgr.dtsi | 95 ++++++++++++ arch/arm64/boot/dts/apple/t604x.dtsi | 160 +++++++++++++++++++++ 4 files changed, 270 insertions(+), 254 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi index 60752a9cf9882..076750158e6dc 100644 --- a/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-pmgr.dtsi @@ -28,17 +28,6 @@ apple,always-on; }; - ps_sio_cpu: power-controller@130 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x130 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "sio_cpu"; - power-domains = <&ps_sio>; - apple,always-on; - status = "disabled"; - }; - ps_fpwm1: power-controller@140 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x140 4>; @@ -171,16 +160,6 @@ status = "disabled"; }; - ps_qspi: power-controller@1e8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x1e8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "qspi"; - power-domains = <&ps_spi_p>; - status = "disabled"; - }; - ps_uart_n: power-controller@1f0 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x1f0 4>; @@ -526,16 +505,6 @@ power-domains = <&ps_apcie_sys_st0>, <&ps_apcie_sys_st1>; status = "disabled"; }; - - ps_jpg: power-controller@3a0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x3a0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "jpg"; - power-domains = <&ps_fab4_soc>; - status = "disabled"; - }; }; &pmgr_aux { @@ -1022,16 +991,6 @@ status = "disabled"; }; - ps_venc0_sys: power-controller@278 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x278 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_sys"; - power-domains = <&ps_fab0_soc>; - status = "disabled"; - }; - ps_fab_gw_0: power-controller@288 { compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; reg = <0x288 4>; @@ -1578,58 +1537,6 @@ }; }; -&pmgr_venc { - ps_venc0_dma: power-controller@0 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x0 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_dma"; - power-domains = <&ps_venc0_sys>; - status = "disabled"; - }; - - ps_venc0_pipe4: power-controller@8 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x8 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_pipe4"; - power-domains = <&ps_venc0_dma>; - status = "disabled"; - }; - - ps_venc0_pipe5: power-controller@10 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x10 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_pipe5"; - power-domains = <&ps_venc0_dma>; - status = "disabled"; - }; - - ps_venc0_me0: power-controller@18 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x18 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_me0"; - power-domains = <&ps_venc0_dma>; - status = "disabled"; - }; - - ps_venc0_me1: power-controller@20 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x20 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "venc0_me1"; - power-domains = <&ps_venc0_me0>; - status = "disabled"; - }; -}; - &ps_avd_sys { power-domains = <&ps_fab0_soc>; }; @@ -1661,3 +1568,11 @@ &ps_pms_sram { power-domains = <&ps_pms>; }; + +&ps_jpg { + power-domains = <&ps_fab4_soc>; +}; + +&ps_venc0_sys { + power-domains = <&ps_fab0_soc>; +}; diff --git a/arch/arm64/boot/dts/apple/t6040.dtsi b/arch/arm64/boot/dts/apple/t6040.dtsi index 8676d3ef0a74e..40d48e6563bf0 100644 --- a/arch/arm64/boot/dts/apple/t6040.dtsi +++ b/arch/arm64/boot/dts/apple/t6040.dtsi @@ -211,13 +211,6 @@ }; }; - cpu_pmu: pmu { - compatible = "apple,t6040-pmu"; - interrupt-parent = <&aic>; - /* The AIC raises both clusters' PMU FIQs as this one. */ - interrupts = ; - }; - /* Named after its sgx range: the coprocessor range is the mailbox node's too. */ gpu: gpu@288000000 { compatible = "apple,agx-t6040"; @@ -251,13 +244,6 @@ #address-cells = <1>; #size-cells = <1>; }; - - pmgr_venc: power-management@502808000 { - compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; - reg = <0x5 0x02808000 0x0 0x4000>; - #address-cells = <1>; - #size-cells = <1>; - }; }; &pmc { @@ -330,29 +316,6 @@ }; / { - /* Additional DARTs; enabled together with their DMA consumers. */ - ave0_dart1: iommu@283080000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x2 0x83080000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_venc0_sys>; - status = "disabled"; - }; - - ave0_dart0: iommu@2830a0000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x2 0x830a0000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_venc0_sys>; - status = "disabled"; - }; - apr0_dart: iommu@301020000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x01020000 0x0 0xc000>; @@ -400,61 +363,6 @@ status = "disabled"; }; - sio_dart: iommu@429060000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x29060000 0x0 0x20000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x1c000 0x2ff 0xfffe4000>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_sio>; - status = "disabled"; - }; - - jpeg0: jpeg@487000000 { - compatible = "apple,t6041-jpeg"; - reg = <0x4 0x87000000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = ; - iommus = <&jpeg0_dart 0>; - power-domains = <&ps_jpg>; - apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; - status = "disabled"; - }; - - jpeg0_dart: iommu@487020000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x87020000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_jpg>; - status = "disabled"; - }; - - jpeg1: jpeg@487060000 { - compatible = "apple,t6041-jpeg"; - reg = <0x4 0x87060000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = ; - iommus = <&jpeg1_dart 0>; - power-domains = <&ps_jpg>; - apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; - status = "disabled"; - }; - - jpeg1_dart: iommu@487080000 { - compatible = "apple,t6041-dart", "apple,t8110-dart"; - reg = <0x4 0x87080000 0x0 0xc000>; - #iommu-cells = <1>; - apple,dma-range = <0x100 0x0 0x300 0x0>; - interrupt-parent = <&aic>; - interrupts = ; - power-domains = <&ps_jpg>; - status = "disabled"; - }; - scaler0_dart: iommu@521260000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x5 0x21260000 0x0 0xc000>; @@ -536,14 +444,6 @@ status = "disabled"; }; - /* The QSPIMC input is ADT clock 434 (200 MHz). */ - clk_200m: clock-200m { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <200000000>; - clock-output-names = "clk_200m"; - }; - spi4: spi@429110000 { compatible = "apple,t6041-spi", "apple,t8103-spi"; reg = <0x4 0x29110000 0x0 0x4000>; @@ -557,67 +457,6 @@ status = "disabled"; }; - qspi: spi@429118000 { - compatible = "apple,t6041-qspi"; - reg = <0x4 0x29118000 0x0 0x4800>; - interrupt-parent = <&aic>; - interrupts = ; - clocks = <&clk_200m>; - power-domains = <&ps_qspi>; - #address-cells = <1>; - #size-cells = <0>; - /* Boards enable it with their flash and its nvram partition. */ - status = "disabled"; - }; - - /* The loader supplies the SIO firmware regions and protocol tables. */ - sio: dma-controller@429e00000 { - compatible = "apple,t6041-sio"; - reg = <0x4 0x29e00000 0x0 0x8000>; - dma-channels = <128>; - #dma-cells = <1>; - mboxes = <&sio_mbox>; - iommus = <&sio_dart 0>; - power-domains = <&ps_sio_cpu>; - status = "disabled"; - }; - - sio_mbox: mailbox@429e08000 { - compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; - reg = <0x4 0x29e08000 0x0 0x4000>; - interrupt-parent = <&aic>; - interrupts = , - , - , - ; - interrupt-names = "send-empty", "send-not-empty", - "recv-empty", "recv-not-empty"; - #mbox-cells = <0>; - power-domains = <&ps_sio_cpu>; - status = "disabled"; - }; - - /* The video encoder stays disabled until its firmware backend is available. */ - ave: video-codec@283100000 { - compatible = "apple,t6041-ave"; - reg = <0x2 0x83100000 0x0 0x45c000>, - <0x2 0x83050000 0x0 0x4000>, - <0x2 0x83800000 0x0 0x800000>; - reg-names = "codec", "mailbox", "coproc"; - interrupt-parent = <&aic>; - interrupts = , - , - , - , - ; - power-domains = <&ps_venc0_dma>, <&ps_venc0_pipe4>, - <&ps_venc0_pipe5>, <&ps_venc0_me0>, <&ps_venc0_me1>, - <&pmc_soc_max>; - power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1", "perf"; - iommus = <&ave0_dart0 0>, <&ave0_dart1 0>; - status = "disabled"; - }; - dcuart: serial@50883c000 { compatible = "apple,dockchannel-uart"; reg = <0x5 0x0883c000 0x0 0x4000>, @@ -715,6 +554,13 @@ power-domain-names = "core", "perf"; }; +&ave { + power-domains = <&ps_venc0_dma>, <&ps_venc0_pipe4>, + <&ps_venc0_pipe5>, <&ps_venc0_me0>, <&ps_venc0_me1>, + <&pmc_soc_max>; + power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1", "perf"; +}; + &usb_drd0_dart_0 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; diff --git a/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi b/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi index f0a951fecd4c2..977818bca2ec3 100644 --- a/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-pmgr.dtsi @@ -610,3 +610,98 @@ status = "disabled"; }; }; + +&pmgr { + ps_sio_cpu: power-controller@130 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x130 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "sio_cpu"; + power-domains = <&ps_sio>; + apple,always-on; + status = "disabled"; + }; + + ps_qspi: power-controller@1e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1e8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "qspi"; + power-domains = <&ps_spi_p>; + status = "disabled"; + }; + + ps_jpg: power-controller@3a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x3a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "jpg"; + status = "disabled"; + }; +}; + +&pmgr_aux { + ps_venc0_sys: power-controller@278 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x278 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_sys"; + status = "disabled"; + }; +}; + +&pmgr_venc { + ps_venc0_dma: power-controller@0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_dma"; + power-domains = <&ps_venc0_sys>; + status = "disabled"; + }; + + ps_venc0_pipe4: power-controller@8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_pipe4"; + power-domains = <&ps_venc0_dma>; + status = "disabled"; + }; + + ps_venc0_pipe5: power-controller@10 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x10 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_pipe5"; + power-domains = <&ps_venc0_dma>; + status = "disabled"; + }; + + ps_venc0_me0: power-controller@18 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x18 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_me0"; + power-domains = <&ps_venc0_dma>; + status = "disabled"; + }; + + ps_venc0_me1: power-controller@20 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x20 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "venc0_me1"; + power-domains = <&ps_venc0_me0>; + status = "disabled"; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index c4dab65b6ab74..bbd8f75eed752 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -1902,6 +1902,166 @@ clocks = <&clkref>, <&clkref>; clock-names = "uart", "clk_uart_baud0"; }; + + cpu_pmu: pmu { + compatible = "apple,t6040-pmu"; + interrupt-parent = <&aic>; + /* The AIC raises both clusters' PMU FIQs as this one. */ + interrupts = ; + }; + + pmgr_venc: power-management@502808000 { + compatible = "apple,t6041-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd"; + reg = <0x5 0x02808000 0x0 0x4000>; + #address-cells = <1>; + #size-cells = <1>; + }; + + /* Additional DARTs; enabled together with their DMA consumers. */ + ave0_dart1: iommu@283080000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x2 0x83080000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc0_sys>; + status = "disabled"; + }; + + ave0_dart0: iommu@2830a0000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x2 0x830a0000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x00004000 0x0 0xffffc000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_venc0_sys>; + status = "disabled"; + }; + + sio_dart: iommu@429060000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x29060000 0x0 0x20000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x1c000 0x2ff 0xfffe4000>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_sio>; + status = "disabled"; + }; + + jpeg0: jpeg@487000000 { + compatible = "apple,t6041-jpeg"; + reg = <0x4 0x87000000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&jpeg0_dart 0>; + power-domains = <&ps_jpg>; + apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; + status = "disabled"; + }; + + jpeg0_dart: iommu@487020000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x87020000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + status = "disabled"; + }; + + jpeg1: jpeg@487060000 { + compatible = "apple,t6041-jpeg"; + reg = <0x4 0x87060000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + iommus = <&jpeg1_dart 0>; + power-domains = <&ps_jpg>; + apple,dma-range = /bits/ 64 <0x10000000000 0x100000000>; + status = "disabled"; + }; + + jpeg1_dart: iommu@487080000 { + compatible = "apple,t6041-dart", "apple,t8110-dart"; + reg = <0x4 0x87080000 0x0 0xc000>; + #iommu-cells = <1>; + apple,dma-range = <0x100 0x0 0x300 0x0>; + interrupt-parent = <&aic>; + interrupts = ; + power-domains = <&ps_jpg>; + status = "disabled"; + }; + + /* The QSPIMC input is ADT clock 434 (200 MHz). */ + clk_200m: clock-200m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + clock-output-names = "clk_200m"; + }; + + qspi: spi@429118000 { + compatible = "apple,t6041-qspi"; + reg = <0x4 0x29118000 0x0 0x4800>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clk_200m>; + power-domains = <&ps_qspi>; + #address-cells = <1>; + #size-cells = <0>; + /* Boards enable it with their flash and its nvram partition. */ + status = "disabled"; + }; + + /* The loader supplies the SIO firmware regions and protocol tables. */ + sio: dma-controller@429e00000 { + compatible = "apple,t6041-sio"; + reg = <0x4 0x29e00000 0x0 0x8000>; + dma-channels = <128>; + #dma-cells = <1>; + mboxes = <&sio_mbox>; + iommus = <&sio_dart 0>; + power-domains = <&ps_sio_cpu>; + status = "disabled"; + }; + + sio_mbox: mailbox@429e08000 { + compatible = "apple,t6041-asc-mailbox", "apple,asc-mailbox-v4"; + reg = <0x4 0x29e08000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = , + , + , + ; + interrupt-names = "send-empty", "send-not-empty", + "recv-empty", "recv-not-empty"; + #mbox-cells = <0>; + power-domains = <&ps_sio_cpu>; + status = "disabled"; + }; + + /* The video encoder stays disabled until its firmware backend is available. */ + ave: video-codec@283100000 { + compatible = "apple,t6041-ave"; + reg = <0x2 0x83100000 0x0 0x45c000>, + <0x2 0x83050000 0x0 0x4000>, + <0x2 0x83800000 0x0 0x800000>; + reg-names = "codec", "mailbox", "coproc"; + interrupt-parent = <&aic>; + interrupts = , + , + , + , + ; + power-domains = <&ps_venc0_dma>, <&ps_venc0_pipe4>, + <&ps_venc0_pipe5>, <&ps_venc0_me0>, <&ps_venc0_me1>; + power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1"; + iommus = <&ave0_dart0 0>, <&ave0_dart1 0>; + status = "disabled"; + }; }; #include "t604x-pmgr.dtsi" From 969cd60e0ffec621558d6340be629b2675a41cf0 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:37:15 -0500 Subject: [PATCH 08/17] arm64: dts: apple: t8132: scale the 720p camera preset The T8132 1280x720 preset crops the top-left 1280x720 corner of the 1920x1080 window that firmware configuration 5 delivers, as the J616s preset did before 99ec97ea33 ("arm64: dts: apple: t604x-j614-j616: scale the 720p camera preset"): a 720p stream shows an off-centre view about two thirds as wide as the 1080p one. Crop the whole window and let the scaler bring it down, as on the J616s. The T8132 ISP has the scaler (apple_isp_hw_t8132.scl1), and isp-cam.c accepts a crop at the origin with the output's aspect ratio. The J604, J623, J624, J713 and J715 dtbs change only in preset1's apple,crop, from <0 0 1280 720> to <0 0 1920 1080>. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t8132-isp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8132-isp.dtsi b/arch/arm64/boot/dts/apple/t8132-isp.dtsi index ef1f3a6cf68f0..2efed49eafc00 100644 --- a/arch/arm64/boot/dts/apple/t8132-isp.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-isp.dtsi @@ -40,12 +40,12 @@ apple,output-size = <1920 1080>; apple,crop = <0 0 1920 1080>; }; - /* 1280x720 */ + /* 1280x720: the same window as 1920x1080, scaled down */ preset1 { apple,config-index = <5>; apple,input-size = <1920 2160>; apple,output-size = <1280 720>; - apple,crop = <0 0 1280 720>; + apple,crop = <0 0 1920 1080>; }; }; }; From d3a3629e234209289dbc81ce4096385914f54627 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:37:39 -0500 Subject: [PATCH 09/17] arm64: dts: apple: t6040-j616s: give the panel the 16-inch width The J616s panel is 345 mm wide, the J616c's 346 mm, for the same 3456x2234 panel at 254 ppi: 3456 / 254 in = 345.6 mm. Every other 16-inch MacBook Pro tree (J316, J416, J516) rounds it to 346 mm. Use 346 on the J616s too. The DCP driver only reports it as the physical size. The J616s and J616s-tether dtbs change only in the panel's width-mm. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t6040-j616s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 32f589aa2971f..9823203e6a23c 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -52,7 +52,7 @@ &panel { compatible = "apple,panel-j616", "apple,panel-mini-led", "apple,panel"; - width-mm = <345>; + width-mm = <346>; height-mm = <223>; adj-height-mm = <216>; /* "Wide color (P3)" in the Apple technical specifications */ From 6ed01bef464bfabea9f398e3290619c75375d5c3 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:38:49 -0500 Subject: [PATCH 10/17] arm64: dts: apple: t604x-j614-j616: enable the JPEG engines on both 69bcf72a56 ("arm64: dts: apple: t6040-j616s: enable the JPEG engines") enabled both JPEG engines, their DARTs and the JPG power domain on the J616s only, and the J614s left them off with no reason given. They are SoC-internal M2M codecs with no board wiring, and the J614s has the same T6040. Enable them in the shared J614/J616 file. The J614s dtb changes only in status = "okay" on jpeg0, jpeg1, their DARTs and ps_jpg. The J616s dtb is unchanged under dtc -s. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t6040-j616s.dts | 21 ------------------- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 9823203e6a23c..9ca8cecd5f849 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -85,27 +85,6 @@ firmware-name = "apple/mesacal-j616s.bin", "apple/msrk-j616s.bin"; }; -&ps_jpg { - status = "okay"; -}; - -&jpeg0_dart { - status = "okay"; -}; - -&jpeg0 { - status = "okay"; -}; - -&jpeg1_dart { - status = "okay"; -}; - -&jpeg1 { - status = "okay"; -}; - - &i2c4 { sd_card_control: card-control@20 { compatible = "apple,t6041-sd-card-control", "apple,sd-card-control"; diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index f4e60643c7c59..c3bfa3a66f459 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -3306,6 +3306,27 @@ status = "okay"; }; +/* Both JPEG engines; they have no board wiring. */ +&ps_jpg { + status = "okay"; +}; + +&jpeg0_dart { + status = "okay"; +}; + +&jpeg0 { + status = "okay"; +}; + +&jpeg1_dart { + status = "okay"; +}; + +&jpeg1 { + status = "okay"; +}; + #include "t6040-j616s-usb3.dtsi" /* External display chain, all disabled: the gate in drivers/soc/apple/display-gate.c enables it. */ From 8a947b9d466e6e9544a49af8448fa43a92572fb9 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:40:04 -0500 Subject: [PATCH 11/17] arm64: dts: apple: t6041: share the J614c and J616c board body The J614c tree is a copy of the J616c's with its own panel, Wi-Fi island, firmware names and disabled speakers. Move what they share into t6041-j614c-j616c.dtsi and keep only those differences in the board files. The J614c's "guess" notes move to its header. They still do not use t604x-j614-j616.dtsi: the J616c's trackpad resets, PCIe, keyboard and display chains differ from the J616s's and are qualified as they are. No output change: the J614c and J616c dtbs are identical under dtc -I dtb -O dts -s; the other dtbs are byte-identical. Signed-off-by: Diljit Singh --- .../boot/dts/apple/t6041-j614c-j616c.dtsi | 926 +++++++++++++++++ arch/arm64/boot/dts/apple/t6041-j614c.dts | 940 +----------------- arch/arm64/boot/dts/apple/t6041-j616c.dts | 922 +---------------- 3 files changed, 986 insertions(+), 1802 deletions(-) create mode 100644 arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi diff --git a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi new file mode 100644 index 0000000000000..c8ab8c8165993 --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi @@ -0,0 +1,926 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Apple MacBook Pro (14-inch and 16-inch, M4 Max, 2024) + * + * The parts the J614c and J616c share. They do not use + * t604x-j614-j616.dtsi yet: the J616c's trackpad resets, PCIe, keyboard + * and display chains differ from the J616s's, and are qualified as they + * are. + * + * target-type: J614c / J616c + * + * Copyright The Asahi Linux Contributors + */ + +#include "t6041-j616c-ane.dtsi" +#include +#include + +/ { + chassis-type = "laptop"; + + aliases { + serial0 = &serial0; + keyboard = &keyboard; + wifi0 = "/pcie@1cb0000000/pci@0,0/wifi@0,0"; + bluetooth0 = "/pcie@1cb0000000/pci@0,0/bluetooth@0,1"; + mtp = &mtp; + dcp = &dcp; + disp0 = &display; + disp0-piodma = &disp0_piodma; + gpu = &gpu; + sep = &sep; + }; + + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + stdout-path = "serial0:115200n8"; + + framebuffer0: framebuffer@0 { + compatible = "apple,simple-framebuffer", "simple-framebuffer"; + reg = <0 0 0 0>; + status = "disabled"; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + }; + + memory@0 { + device_type = "memory"; + reg = <0 0 0 0>; + }; + + serial0: serial@429200000 { + compatible = "apple,s5l-uart"; + reg = <0x4 0x29200000 0x0 0x1000>; + reg-io-width = <4>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clkref>, <&clkref>; + clock-names = "uart", "clk_uart_baud0"; + }; + + clk_disp0: clock-disp0 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <712000000>; + clock-output-names = "disp0"; + }; + + thermal-zones { + cpu-die-thermal { + polling-delay-passive = <1000>; + polling-delay = <1000>; + thermal-sensors = <&smc_hwmon 0>; + + trips { + cpu_die_passive: cpu-die-passive { + temperature = <113000>; + hysteresis = <5000>; + type = "passive"; + }; + + cpu-die-critical { + temperature = <118000>; + hysteresis = <0>; + type = "critical"; + }; + }; + + cooling-maps { + map-e { + trip = <&cpu_die_passive>; + cooling-device = + <&cpu_e0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_e1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_e2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_e3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map-p0 { + trip = <&cpu_die_passive>; + cooling-device = + <&cpu_p00 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p01 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p02 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p03 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p04 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p05 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map-p1 { + trip = <&cpu_die_passive>; + cooling-device = + <&cpu_p10 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p11 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p12 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p13 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p14 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_p15 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; +}; + +&cpufreq_e { + /delete-property/ apple,fast-die-effort; +}; + +&cpufreq_p0 { + /delete-property/ apple,fast-die-effort; +}; + +&cpufreq_p1 { + /delete-property/ apple,fast-die-effort; +}; + +&wdt { + timeout-sec = <140>; +}; + +&smc { + status = "okay"; + + smc_gpio_low: gpio-low { + compatible = "apple,smc-low-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; +}; + +&smc_mbox { + status = "okay"; +}; + +&nub_spmi0 { + status = "okay"; +}; + +&mcc { + status = "okay"; +}; + +&smc_hwmon { + temperature-TCMz { + apple,key-id = "TCMz"; + label = "CPU Die Max"; + }; + temperature-TCMb { apple,key-id = "TCMb"; label = "CPU TCMb"; }; + temperature-Tpx0 { apple,key-id = "Tpx0"; label = "CPU Tpx0"; }; + temperature-Tpx1 { apple,key-id = "Tpx1"; label = "CPU Tpx1"; }; + temperature-Tpx2 { apple,key-id = "Tpx2"; label = "CPU Tpx2"; }; + temperature-Tpx3 { apple,key-id = "Tpx3"; label = "CPU Tpx3"; }; + temperature-Tpx4 { apple,key-id = "Tpx4"; label = "CPU Tpx4"; }; + temperature-Tpx5 { apple,key-id = "Tpx5"; label = "CPU Tpx5"; }; + temperature-Tpx8 { apple,key-id = "Tpx8"; label = "CPU Tpx8"; }; + temperature-Tpx9 { apple,key-id = "Tpx9"; label = "CPU Tpx9"; }; + temperature-TpxA { apple,key-id = "TpxA"; label = "CPU TpxA"; }; + temperature-TpxB { apple,key-id = "TpxB"; label = "CPU TpxB"; }; + temperature-TpxC { apple,key-id = "TpxC"; label = "CPU TpxC"; }; + temperature-TpxD { apple,key-id = "TpxD"; label = "CPU TpxD"; }; + temperature-Tex0 { apple,key-id = "Tex0"; label = "CPU Tex0"; }; + temperature-Tex1 { apple,key-id = "Tex1"; label = "CPU Tex1"; }; + temperature-Tex2 { apple,key-id = "Tex2"; label = "CPU Tex2"; }; + temperature-Tex3 { apple,key-id = "Tex3"; label = "CPU Tex3"; }; + temperature-TH0x { apple,key-id = "TH0x"; label = "NAND Flash Temperature"; }; + temperature-TB0T { apple,key-id = "TB0T"; label = "Battery Hotspot"; }; + temperature-TCHP { apple,key-id = "TCHP"; label = "Charge Regulator Temp"; }; + temperature-TW0P { apple,key-id = "TW0P"; label = "WiFi/BT Module Temp"; }; + power-PSTR { apple,key-id = "PSTR"; label = "Total System Power"; }; + power-PHPC { apple,key-id = "PHPC"; label = "Heatpipe Power"; }; + power-PDTR { apple,key-id = "PDTR"; label = "AC Input Power"; }; + voltage-VD0R { apple,key-id = "VD0R"; label = "AC Input Voltage"; }; + voltage-SBAV { apple,key-id = "SBAV"; label = "Battery Voltage"; }; + current-ID0R { apple,key-id = "ID0R"; label = "AC Input Current"; }; +}; + +&pinctrl { + status = "okay"; + + wifi_clkreq_pins: wifi-clkreq-pins { + pinmux = ; + }; +}; + +&pinctrl_nub { + status = "okay"; + /delete-property/ interrupt-controller; + /delete-property/ #interrupt-cells; + /delete-property/ interrupts; +}; + +&mtp { + status = "okay"; +}; + +&mtp_mbox { + status = "okay"; +}; + +&mtp_dart { + status = "okay"; +}; + +&mtp_dockchannel { + status = "okay"; +}; + +&mtp_hid { + compatible = "apple,dockchannel-hid"; + apple,afe-reset-gpios = <&smc_gpio_low 25 GPIO_ACTIVE_LOW>; + apple,stm-reset-gpios = <&smc_gpio_low 26 GPIO_ACTIVE_LOW>; + + multi-touch { + apple,power-method = <2>; + }; + + keyboard: keyboard { + hid-country-code = <0>; + apple,keyboard-layout-id = <0>; + }; + + stm { + }; + + actuator { + }; + + tp-accel { + }; + + mtp { + }; +}; + +&pcie_dart { + status = "okay"; +}; + +/ { + pcie0: pcie@1cb0000000 { + compatible = "apple,t6041-pcie", "apple,t6020-pcie"; + reg = <0x1c 0xb0000000 0x0 0x1000000>, + <0x4 0x14000000 0x0 0x4000>, + <0x4 0x10028000 0x0 0x4000>, + <0x4 0x11028000 0x0 0x4000>, + <0x4 0x12028000 0x0 0x4000>, + <0x4 0x13028000 0x0 0x4000>, + <0x4 0x17020000 0x0 0x4000>, + <0x4 0x17024000 0x0 0x4000>, + <0x4 0x17028000 0x0 0x4000>, + <0x4 0x1702c000 0x0 0x4000>; + reg-names = "config", "rc", + "port0", "port1", "port2", "port3", + "phy0", "phy1", "phy2", "phy3"; + ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_clkreq_pins>; + #size-cells = <2>; + #address-cells = <3>; + bus-range = <0 1>; + iommu-map-mask = <0xffff>; + iommu-map = <0x100 &pcie_dart 1 2>; + msi-ranges = <&aic AIC_IRQ 2071 IRQ_TYPE_EDGE_RISING 32>; + msi-parent = <&pcie0>; + msi-controller; + interrupts = <0 0x6bb 4>; + interrupt-parent = <&aic>; + device_type = "pci"; + + port00: pci@0,0 { + reg = <0 0 0 0 0>; + ranges; + interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; + interrupt-map-mask = <0 0 0 7>; + #interrupt-cells = <1>; + interrupt-controller; + #size-cells = <2>; + #address-cells = <3>; + pwren-gpios = <&smc_gpio 0x13 0>; + reset-gpios = <&pinctrl 4 1>; + device_type = "pci"; + + bluetooth0: bluetooth@0,1 { + compatible = "pci14e4,5f72"; + reg = <0x100 0 0 0 0>; + local-bd-address = [00 00 00 00 00 00]; + status = "okay"; + }; + + wifi0: wifi@0,0 { + compatible = "pci14e4,4434", "brcm,bcm4329-fmac"; + reg = <0 0 0 0 0>; + brcm,ccode-map-trivial; + }; + }; + }; +}; + +&ans_mbox { + status = "okay"; +}; + +&ans_sart { + status = "okay"; +}; + +&nvme { + status = "okay"; +}; + +&display { + phandle = <&display>; + status = "okay"; +}; + +&dcp { + clocks = <&clk_disp0>; + phandle = <&dcp>; + + panel: panel { + apple,max-brightness = <500>; + /* "Wide color (P3)" in the Apple technical specifications */ + apple,color-gamut = "display-p3"; + }; +}; + +&disp0_piodma { + phandle = <&disp0_piodma>; +}; + +&nub_spmi_a0 { + status = "okay"; + + hpm1: usb-pd@a { + compatible = "apple,sn201202x"; + reg = <0xa SPMI_USID>; + interrupts = <37 IRQ_TYPE_EDGE_RISING>, + <39 IRQ_TYPE_EDGE_RISING>, + <43 IRQ_TYPE_EDGE_RISING>, + <45 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "irq", "select", "sleep", "wake"; + + typec1: connector { + compatible = "usb-c-connector"; + label = "USB-C Left Front"; + power-role = "dual"; + data-role = "dual"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + typec1_con_hs: endpoint { + remote-endpoint = <&usb_drd1_hs>; + }; + }; + }; + }; + }; +}; + +&nub_spmi_a1 { + status = "okay"; + + hpm2: usb-pd@c { + compatible = "apple,sn201202x"; + reg = <0xc SPMI_USID>; + interrupts = <11 IRQ_TYPE_EDGE_RISING>, + <13 IRQ_TYPE_EDGE_RISING>, + <17 IRQ_TYPE_EDGE_RISING>, + <19 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "irq", "select", "sleep", "wake"; + + typec2: connector { + compatible = "usb-c-connector"; + label = "USB-C Right"; + power-role = "dual"; + data-role = "dual"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + typec2_con_hs: endpoint { + remote-endpoint = <&usb_drd2_hs>; + }; + }; + }; + }; + }; +}; + +&atcphy1 { + apple,tunable-usb2-host = <0x8 0x7003 0x3>; + status = "okay"; +}; + +&usb_drd1_dart_0 { + status = "okay"; +}; + +&usb_drd1_dart_1 { + status = "okay"; +}; + +&usb_drd1 { + maximum-speed = "high-speed"; + phys = <&atcphy1 PHY_TYPE_USB2>; + phy-names = "usb2-phy"; + apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, + <0x2c 0x000a07ff 0x000800c8>, <0x100 0x02000100 0x02000100>, + <0x504 0x00001000 0x0>, <0x528 0xff0000ff 0x06000006>, + <0x52c 0xff0000ff 0x08000008>, <0x538 0x00000800 0x00000800>, + <0x580 0xffffffff 0x6f000006>; + apple,tunable-cfg-host = <0x20 0xff 0x1b>; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + usb_drd1_hs: endpoint { + remote-endpoint = <&typec1_con_hs>; + }; + }; + }; +}; + +&atcphy2 { + apple,tunable-usb2-host = <0x8 0x7003 0x3>; + status = "okay"; +}; + +&usb_drd2_dart_0 { + status = "okay"; +}; + +&usb_drd2_dart_1 { + status = "okay"; +}; + +&usb_drd2 { + maximum-speed = "high-speed"; + phys = <&atcphy2 PHY_TYPE_USB2>; + phy-names = "usb2-phy"; + apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, + <0x2c 0x000a07ff 0x000800c8>, <0x100 0x02000100 0x02000100>, + <0x504 0x00001000 0x0>, <0x528 0xff0000ff 0x06000006>, + <0x52c 0xff0000ff 0x08000008>, <0x538 0x00000800 0x00000800>, + <0x580 0xffffffff 0x6f000006>; + apple,tunable-cfg-host = <0x20 0xff 0x1b>; + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + usb_drd2_hs: endpoint { + remote-endpoint = <&typec2_con_hs>; + }; + }; + }; +}; + +/ { + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gpu_uat_ttbs: uat-ttbs { + no-map; + status = "disabled"; + }; + + gpu_uat_pagetables: uat-pagetables { + no-map; + status = "disabled"; + }; + + gpu_uat_l2_pagetables: uat-l2-pagetables { + no-map; + status = "disabled"; + }; + + gpu_uat_handoff: uat-handoff { + no-map; + status = "disabled"; + }; + + gpu_fw_text: gpu-fw-text { + no-map; + status = "disabled"; + }; + + gpu_fw_data: gpu-fw-data { + no-map; + status = "disabled"; + }; + }; + + gpu_opp: opp-table-gpu { + compatible = "operating-points-v2"; + + opp00 { + opp-hz = /bits/ 64 <0>; + opp-microvolt = <125000 125000 125000 125000>; + }; + opp01 { + opp-hz = /bits/ 64 <338000000>; + opp-microvolt = <600000 600000 600000 600000>; + }; + opp02 { + opp-hz = /bits/ 64 <618000000>; + opp-microvolt = <665000 665000 660000 660000>; + }; + opp03 { + opp-hz = /bits/ 64 <796000000>; + opp-microvolt = <705000 705000 700000 705000>; + }; + opp04 { + opp-hz = /bits/ 64 <924000000>; + opp-microvolt = <725000 725000 715000 730000>; + }; + opp05 { + opp-hz = /bits/ 64 <952000000>; + opp-microvolt = <770000 770000 770000 780000>; + }; + opp06 { + opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <770000 770000 770000 780000>; + }; + opp07 { + opp-hz = /bits/ 64 <1062000000>; + opp-microvolt = <810000 810000 805000 810000>; + }; + opp08 { + opp-hz = /bits/ 64 <1182000000>; + opp-microvolt = <810000 810000 805000 810000>; + }; + opp09 { + opp-hz = /bits/ 64 <1182000000>; + opp-microvolt = <860000 860000 860000 860000>; + }; + opp10 { + opp-hz = /bits/ 64 <1312000000>; + opp-microvolt = <860000 860000 860000 860000>; + }; + opp11 { + opp-hz = /bits/ 64 <1242000000>; + opp-microvolt = <900000 895000 900000 900000>; + }; + opp12 { + opp-hz = /bits/ 64 <1380000000>; + opp-microvolt = <900000 895000 900000 900000>; + }; + opp13 { + opp-hz = /bits/ 64 <1326000000>; + opp-microvolt = <940000 925000 940000 940000>; + }; + opp14 { + opp-hz = /bits/ 64 <1470000000>; + opp-microvolt = <940000 925000 940000 940000>; + }; + opp15 { + opp-hz = /bits/ 64 <1578000000>; + opp-microvolt = <1020000 1020000 1020000 1020000>; + }; + }; + + gpu_cs_opp: opp-table-gpucs { + compatible = "operating-points-v2"; + + opp00 { + opp-hz = /bits/ 64 <24000000>; + opp-microvolt = <585000>; + }; + opp01 { + opp-hz = /bits/ 64 <338000000>; + opp-microvolt = <585000>; + }; + opp02 { + opp-hz = /bits/ 64 <618000000>; + opp-microvolt = <635000>; + }; + opp03 { + opp-hz = /bits/ 64 <796000000>; + opp-microvolt = <685000>; + }; + opp04 { + opp-hz = /bits/ 64 <992000000>; + opp-microvolt = <720000>; + }; + opp05 { + opp-hz = /bits/ 64 <1188000000>; + opp-microvolt = <770000>; + }; + opp06 { + opp-hz = /bits/ 64 <1380000000>; + opp-microvolt = <855000>; + }; + opp07 { + opp-hz = /bits/ 64 <1470000000>; + opp-microvolt = <885000>; + }; + }; + + gpu_afr_opp: opp-table-gpuafr { + compatible = "operating-points-v2"; + + opp00 { + opp-hz = /bits/ 64 <24000000>; + opp-microvolt = <585000>; + }; + opp01 { + opp-hz = /bits/ 64 <338000000>; + opp-microvolt = <585000>; + }; + opp02 { + opp-hz = /bits/ 64 <618000000>; + opp-microvolt = <635000>; + }; + opp03 { + opp-hz = /bits/ 64 <796000000>; + opp-microvolt = <685000>; + }; + opp04 { + opp-hz = /bits/ 64 <992000000>; + opp-microvolt = <720000>; + }; + opp05 { + opp-hz = /bits/ 64 <1188000000>; + opp-microvolt = <770000>; + }; + opp06 { + opp-hz = /bits/ 64 <1380000000>; + opp-microvolt = <855000>; + }; + opp07 { + opp-hz = /bits/ 64 <1470000000>; + opp-microvolt = <885000>; + }; + }; +}; + +&gpu { + memory-region = <&gpu_uat_ttbs>, <&gpu_uat_pagetables>, + <&gpu_uat_handoff>, <&gpu_fw_data>, + <&gpu_uat_l2_pagetables>, <&gpu_fw_text>; + memory-region-names = "ttbs", "pagetables", "handoff", "fw-data", + "l2-pagetables", "fw-text"; + operating-points-v2 = <&gpu_opp>; + apple,cs-opp = <&gpu_cs_opp>; + apple,afr-opp = <&gpu_afr_opp>; + apple,firmware-version = <26 5 2>; +}; + +/ { + aliases { + aop = &aop; + }; + speaker_sdz: regulator-sn012776-sdz { + compatible = "regulator-fixed"; + regulator-name = "sn012776-sdz"; + gpios = <&pinctrl 54 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + sound: sound { + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + link-name = "Speakers"; + dai-tdm-idle-mode-0 = "zero"; + dai-tdm-idle-mode-1 = "zero"; + dai-tdm-slot-tx-idle-mask-0 = <0xf0f0f0>; + dai-tdm-slot-tx-idle-mask-1 = <0x0f0f0f>; + + cpu { + sound-dai = <&aop_audio 3>; + }; + + codec { + sound-dai = <&speaker_left_woof1>, <&speaker_right_woof1>, + <&speaker_left_woof2>, <&speaker_right_woof2>, + <&speaker_left_tweet>, <&speaker_right_tweet>; + }; + }; + }; + + sound_jack: sound-jack { + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + link-name = "Headphone Jack"; + + cpu { + sound-dai = <&aop_audio 4>; + }; + + codec { + sound-dai = <&jack_codec>; + }; + }; + }; +}; + +&aop { + status = "okay"; +}; + +&aop_mbox { + status = "okay"; +}; + +&aop_dart { + status = "okay"; +}; + +&admac0 { + status = "okay"; +}; + +&admac1 { + status = "okay"; +}; + +&aop_audio { + apple,machine-kind = "MacBook Pro"; +}; + +&i2c1 { + status = "okay"; + + speaker_left_woof1: codec@38 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x38>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Woofer 1"; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + ti,imon-slot-no = <0>; + ti,vmon-slot-no = <2>; + }; + + speaker_left_woof2: codec@39 { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x39>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Woofer 2"; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + ti,imon-slot-no = <8>; + ti,vmon-slot-no = <10>; + }; + + speaker_left_tweet: codec@3a { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3a>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Tweeter"; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + ti,imon-slot-no = <16>; + ti,vmon-slot-no = <18>; + }; +}; + +&i2c3 { + status = "okay"; + + speaker_right_woof1: codec@3b { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3b>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Woofer 1"; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + ti,imon-slot-no = <4>; + ti,vmon-slot-no = <6>; + }; + + speaker_right_woof2: codec@3c { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3c>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Woofer 2"; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + ti,imon-slot-no = <12>; + ti,vmon-slot-no = <14>; + }; + + speaker_right_tweet: codec@3d { + compatible = "ti,sn012776", "ti,tas2764"; + reg = <0x3d>; + SDZ-supply = <&speaker_sdz>; + apple,sdz-group-fail-closed; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Tweeter"; + interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; + ti,imon-slot-no = <20>; + ti,vmon-slot-no = <22>; + }; +}; + +&i2c2 { + status = "okay"; + + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + reset-gpios = <&pinctrl_nub 58 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + interrupts-extended = <&pinctrl 106 IRQ_TYPE_LEVEL_LOW>; + sound-name-prefix = "Jack"; + }; +}; + +&aop { nonposted-mmio; }; + +&aop_als { status = "disabled"; }; +&aop_las { status = "disabled"; }; + +&admac1 { dma-channels = <26>; nonposted-mmio; }; +&admac0 { nonposted-mmio; }; +&aop_dart { nonposted-mmio; }; +&i2c1 { nonposted-mmio; }; +&i2c2 { nonposted-mmio; }; +&i2c3 { nonposted-mmio; }; + +/ { + reserved-memory { + aop_mmio_pmgr: aop-mmio-pmgr@508304000 { + reg = <0x5 0x08304000 0x0 0x4000>; + iommu-addresses = <&aop 0x5 0x08304000 0x0 0x4000>; + no-map; + }; + }; +}; + +&sep_mbox { + status = "okay"; +}; + +&spi2 { + status = "okay"; +}; + +&mesa { + status = "okay"; + enable-gpios = <&pinctrl_nub 53 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&pinctrl>; + interrupts = <116 IRQ_TYPE_EDGE_RISING>; + spi-cs-setup-delay-ns = <20>; + spi-cs-hold-delay-ns = <20>; +}; + +&aop { + memory-region = <&aop_mmio_pmgr>; +}; + +#include "hwmon-fan-dual.dtsi" + +&smc_hwmon { + fan-F0Ac { + apple,fan-manual-control; + }; + + fan-F1Ac { + apple,fan-manual-control; + }; +}; + +#include "t604x-extdisp.dtsi" + +/delete-node/ &atcphy0_xbar; +/delete-node/ &atcphy2_xbar; + +#include "t6041-j616c-hdmi.dtsi" +#include "t6041-j616c-usbc.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6041-j614c.dts b/arch/arm64/boot/dts/apple/t6041-j614c.dts index 14a10a0a31cf0..b74066f3facbf 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j614c.dts @@ -5,7 +5,9 @@ * target-type: J614c * * The J616c's T6041 wiring with the 14-inch chassis of the J614s. There is - * no J614c ADT yet: values marked "guess" follow those two boards. + * no J614c ADT yet: its CPU limits and operating points, trackpad and + * keyboard wiring and panel brightness are the J616c's (guessed), and its + * Wi-Fi island the J614s's (guessed). * * Copyright The Asahi Linux Contributors */ @@ -13,946 +15,78 @@ /dts-v1/; #include "t6041.dtsi" -#include "t6041-j616c-ane.dtsi" -#include -#include +#include "t6041-j614c-j616c.dtsi" / { compatible = "apple,j614c", "apple,t6041", "apple,arm-platform"; model = "Apple MacBook Pro (14-inch, M4 Max, 2024)"; - chassis-type = "laptop"; - - aliases { - serial0 = &serial0; - keyboard = &keyboard; - wifi0 = "/pcie@1cb0000000/pci@0,0/wifi@0,0"; - bluetooth0 = "/pcie@1cb0000000/pci@0,0/bluetooth@0,1"; - mtp = &mtp; - dcp = &dcp; - disp0 = &display; - disp0-piodma = &disp0_piodma; - gpu = &gpu; - sep = &sep; - }; - - chosen { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - stdout-path = "serial0:115200n8"; - - framebuffer0: framebuffer@0 { - compatible = "apple,simple-framebuffer", "simple-framebuffer"; - reg = <0 0 0 0>; - status = "disabled"; - }; - }; - - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - }; - - memory@0 { - device_type = "memory"; - reg = <0 0 0 0>; - }; - - serial0: serial@429200000 { - compatible = "apple,s5l-uart"; - reg = <0x4 0x29200000 0x0 0x1000>; - reg-io-width = <4>; - interrupt-parent = <&aic>; - interrupts = ; - clocks = <&clkref>, <&clkref>; - clock-names = "uart", "clk_uart_baud0"; - }; - - clk_disp0: clock-disp0 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <712000000>; - clock-output-names = "disp0"; - }; - - /* guess: the J616c's limits */ - thermal-zones { - cpu-die-thermal { - polling-delay-passive = <1000>; - polling-delay = <1000>; - thermal-sensors = <&smc_hwmon 0>; - - trips { - cpu_die_passive: cpu-die-passive { - temperature = <113000>; - hysteresis = <5000>; - type = "passive"; - }; - - cpu-die-critical { - temperature = <118000>; - hysteresis = <0>; - type = "critical"; - }; - }; - - cooling-maps { - map-e { - trip = <&cpu_die_passive>; - cooling-device = - <&cpu_e0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_e1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_e2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_e3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - - map-p0 { - trip = <&cpu_die_passive>; - cooling-device = - <&cpu_p00 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p01 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p02 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p03 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p04 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p05 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - - map-p1 { - trip = <&cpu_die_passive>; - cooling-device = - <&cpu_p10 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p11 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p12 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p13 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p14 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p15 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; - }; - }; -}; - -&cpufreq_e { - /delete-property/ apple,fast-die-effort; -}; - -&cpufreq_p0 { - /delete-property/ apple,fast-die-effort; }; -&cpufreq_p1 { - /delete-property/ apple,fast-die-effort; -}; - -&wdt { - timeout-sec = <140>; -}; - -&smc { - status = "okay"; - - smc_gpio_low: gpio-low { - compatible = "apple,smc-low-gpio"; - gpio-controller; - #gpio-cells = <2>; - }; -}; - -&smc_mbox { - status = "okay"; -}; - -&nub_spmi0 { - status = "okay"; -}; - -&mcc { - status = "okay"; -}; - -&smc_hwmon { - temperature-TCMz { - apple,key-id = "TCMz"; - label = "CPU Die Max"; - }; - temperature-TCMb { apple,key-id = "TCMb"; label = "CPU TCMb"; }; - temperature-Tpx0 { apple,key-id = "Tpx0"; label = "CPU Tpx0"; }; - temperature-Tpx1 { apple,key-id = "Tpx1"; label = "CPU Tpx1"; }; - temperature-Tpx2 { apple,key-id = "Tpx2"; label = "CPU Tpx2"; }; - temperature-Tpx3 { apple,key-id = "Tpx3"; label = "CPU Tpx3"; }; - temperature-Tpx4 { apple,key-id = "Tpx4"; label = "CPU Tpx4"; }; - temperature-Tpx5 { apple,key-id = "Tpx5"; label = "CPU Tpx5"; }; - temperature-Tpx8 { apple,key-id = "Tpx8"; label = "CPU Tpx8"; }; - temperature-Tpx9 { apple,key-id = "Tpx9"; label = "CPU Tpx9"; }; - temperature-TpxA { apple,key-id = "TpxA"; label = "CPU TpxA"; }; - temperature-TpxB { apple,key-id = "TpxB"; label = "CPU TpxB"; }; - temperature-TpxC { apple,key-id = "TpxC"; label = "CPU TpxC"; }; - temperature-TpxD { apple,key-id = "TpxD"; label = "CPU TpxD"; }; - temperature-Tex0 { apple,key-id = "Tex0"; label = "CPU Tex0"; }; - temperature-Tex1 { apple,key-id = "Tex1"; label = "CPU Tex1"; }; - temperature-Tex2 { apple,key-id = "Tex2"; label = "CPU Tex2"; }; - temperature-Tex3 { apple,key-id = "Tex3"; label = "CPU Tex3"; }; - temperature-TH0x { apple,key-id = "TH0x"; label = "NAND Flash Temperature"; }; - temperature-TB0T { apple,key-id = "TB0T"; label = "Battery Hotspot"; }; - temperature-TCHP { apple,key-id = "TCHP"; label = "Charge Regulator Temp"; }; - temperature-TW0P { apple,key-id = "TW0P"; label = "WiFi/BT Module Temp"; }; - power-PSTR { apple,key-id = "PSTR"; label = "Total System Power"; }; - power-PHPC { apple,key-id = "PHPC"; label = "Heatpipe Power"; }; - power-PDTR { apple,key-id = "PDTR"; label = "AC Input Power"; }; - voltage-VD0R { apple,key-id = "VD0R"; label = "AC Input Voltage"; }; - voltage-SBAV { apple,key-id = "SBAV"; label = "Battery Voltage"; }; - current-ID0R { apple,key-id = "ID0R"; label = "AC Input Current"; }; -}; - -&pinctrl { - status = "okay"; - - wifi_clkreq_pins: wifi-clkreq-pins { - pinmux = ; - }; -}; - -&pinctrl_nub { - status = "okay"; - /delete-property/ interrupt-controller; - /delete-property/ #interrupt-cells; - /delete-property/ interrupts; -}; - -&mtp { - status = "okay"; -}; - -&mtp_mbox { - status = "okay"; -}; - -&mtp_dart { - status = "okay"; -}; - -&mtp_dockchannel { - status = "okay"; -}; - -/* guess: the J616c's trackpad and keyboard wiring */ &mtp_hid { - compatible = "apple,dockchannel-hid"; - apple,afe-reset-gpios = <&smc_gpio_low 25 GPIO_ACTIVE_LOW>; - apple,stm-reset-gpios = <&smc_gpio_low 26 GPIO_ACTIVE_LOW>; - multi-touch { firmware-name = "apple/tpmtfw-j614c.bin"; - apple,power-method = <2>; - }; - - keyboard: keyboard { - hid-country-code = <0>; - apple,keyboard-layout-id = <0>; - }; - - stm { - }; - - actuator { - }; - - tp-accel { - }; - - mtp { - }; -}; - -&pcie_dart { - status = "okay"; -}; - -/ { - pcie0: pcie@1cb0000000 { - compatible = "apple,t6041-pcie", "apple,t6020-pcie"; - reg = <0x1c 0xb0000000 0x0 0x1000000>, - <0x4 0x14000000 0x0 0x4000>, - <0x4 0x10028000 0x0 0x4000>, - <0x4 0x11028000 0x0 0x4000>, - <0x4 0x12028000 0x0 0x4000>, - <0x4 0x13028000 0x0 0x4000>, - <0x4 0x17020000 0x0 0x4000>, - <0x4 0x17024000 0x0 0x4000>, - <0x4 0x17028000 0x0 0x4000>, - <0x4 0x1702c000 0x0 0x4000>; - reg-names = "config", "rc", - "port0", "port1", "port2", "port3", - "phy0", "phy1", "phy2", "phy3"; - ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_clkreq_pins>; - #size-cells = <2>; - #address-cells = <3>; - bus-range = <0 1>; - iommu-map-mask = <0xffff>; - iommu-map = <0x100 &pcie_dart 1 2>; - msi-ranges = <&aic AIC_IRQ 2071 IRQ_TYPE_EDGE_RISING 32>; - msi-parent = <&pcie0>; - msi-controller; - interrupts = <0 0x6bb 4>; - interrupt-parent = <&aic>; - device_type = "pci"; - - port00: pci@0,0 { - reg = <0 0 0 0 0>; - ranges; - interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; - interrupt-map-mask = <0 0 0 7>; - #interrupt-cells = <1>; - interrupt-controller; - #size-cells = <2>; - #address-cells = <3>; - pwren-gpios = <&smc_gpio 0x13 0>; - reset-gpios = <&pinctrl 4 1>; - device_type = "pci"; - - bluetooth@0,1 { - compatible = "pci14e4,5f72"; - reg = <0x100 0 0 0 0>; - local-bd-address = [00 00 00 00 00 00]; - /* guess: the J614s's Wi-Fi island */ - brcm,board-type = "apple,mriya"; - status = "okay"; - }; - - wifi@0,0 { - compatible = "pci14e4,4434", "brcm,bcm4329-fmac"; - reg = <0 0 0 0 0>; - brcm,ccode-map-trivial; - brcm,board-type = "apple,mriya"; - }; - }; - }; -}; - -&ans_mbox { - status = "okay"; -}; - -&ans_sart { - status = "okay"; -}; - -&nvme { - status = "okay"; -}; - -&display { - phandle = <&display>; - status = "okay"; -}; - -&dcp { - clocks = <&clk_disp0>; - phandle = <&dcp>; - - /* The J614s panel; guess: the J616c's brightness limit */ - panel { - compatible = "apple,panel-j614", "apple,panel-mini-led", "apple,panel"; - width-mm = <302>; - height-mm = <196>; - adj-height-mm = <189>; - apple,max-brightness = <500>; - /* "Wide color (P3)" in the Apple technical specifications */ - apple,color-gamut = "display-p3"; - }; -}; - -&disp0_piodma { - phandle = <&disp0_piodma>; -}; - -&nub_spmi_a0 { - status = "okay"; - - hpm1: usb-pd@a { - compatible = "apple,sn201202x"; - reg = <0xa SPMI_USID>; - interrupts = <37 IRQ_TYPE_EDGE_RISING>, - <39 IRQ_TYPE_EDGE_RISING>, - <43 IRQ_TYPE_EDGE_RISING>, - <45 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "select", "sleep", "wake"; - - typec1: connector { - compatible = "usb-c-connector"; - label = "USB-C Left Front"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec1_con_hs: endpoint { - remote-endpoint = <&usb_drd1_hs>; - }; - }; - }; - }; }; }; -&nub_spmi_a1 { - status = "okay"; - - hpm2: usb-pd@c { - compatible = "apple,sn201202x"; - reg = <0xc SPMI_USID>; - interrupts = <11 IRQ_TYPE_EDGE_RISING>, - <13 IRQ_TYPE_EDGE_RISING>, - <17 IRQ_TYPE_EDGE_RISING>, - <19 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "select", "sleep", "wake"; - - typec2: connector { - compatible = "usb-c-connector"; - label = "USB-C Right"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec2_con_hs: endpoint { - remote-endpoint = <&usb_drd2_hs>; - }; - }; - }; - }; - }; +&wifi0 { + brcm,board-type = "apple,mriya"; }; -&atcphy1 { - apple,tunable-usb2-host = <0x8 0x7003 0x3>; - status = "okay"; +&bluetooth0 { + brcm,board-type = "apple,mriya"; }; -&usb_drd1_dart_0 { - status = "okay"; +/* The J614s panel. */ +&panel { + compatible = "apple,panel-j614", "apple,panel-mini-led", "apple,panel"; + width-mm = <302>; + height-mm = <196>; + adj-height-mm = <189>; }; -&usb_drd1_dart_1 { - status = "okay"; +/* + * The J614s speakers: no bring-up and no protection profile yet, so the + * card and the six amps stay disabled, as on the J614s. + */ +&sound { + compatible = "apple,j614-macaudio", "apple,macaudio"; + model = "MacBook Pro J614"; + status = "disabled"; }; -&usb_drd1 { - maximum-speed = "high-speed"; - phys = <&atcphy1 PHY_TYPE_USB2>; - phy-names = "usb2-phy"; - apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, - <0x2c 0x000a07ff 0x000800c8>, <0x100 0x02000100 0x02000100>, - <0x504 0x00001000 0x0>, <0x528 0xff0000ff 0x06000006>, - <0x52c 0xff0000ff 0x08000008>, <0x538 0x00000800 0x00000800>, - <0x580 0xffffffff 0x6f000006>; - apple,tunable-cfg-host = <0x20 0xff 0x1b>; - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usb_drd1_hs: endpoint { - remote-endpoint = <&typec1_con_hs>; - }; - }; - }; +&speaker_left_woof1 { + status = "disabled"; }; -&atcphy2 { - apple,tunable-usb2-host = <0x8 0x7003 0x3>; - status = "okay"; +&speaker_left_woof2 { + status = "disabled"; }; -&usb_drd2_dart_0 { - status = "okay"; +&speaker_left_tweet { + status = "disabled"; }; -&usb_drd2_dart_1 { - status = "okay"; +&speaker_right_woof1 { + status = "disabled"; }; -&usb_drd2 { - maximum-speed = "high-speed"; - phys = <&atcphy2 PHY_TYPE_USB2>; - phy-names = "usb2-phy"; - apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, - <0x2c 0x000a07ff 0x000800c8>, <0x100 0x02000100 0x02000100>, - <0x504 0x00001000 0x0>, <0x528 0xff0000ff 0x06000006>, - <0x52c 0xff0000ff 0x08000008>, <0x538 0x00000800 0x00000800>, - <0x580 0xffffffff 0x6f000006>; - apple,tunable-cfg-host = <0x20 0xff 0x1b>; - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usb_drd2_hs: endpoint { - remote-endpoint = <&typec2_con_hs>; - }; - }; - }; -}; - -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - gpu_uat_ttbs: uat-ttbs { - no-map; - status = "disabled"; - }; - - gpu_uat_pagetables: uat-pagetables { - no-map; - status = "disabled"; - }; - - gpu_uat_l2_pagetables: uat-l2-pagetables { - no-map; - status = "disabled"; - }; - - gpu_uat_handoff: uat-handoff { - no-map; - status = "disabled"; - }; - - gpu_fw_text: gpu-fw-text { - no-map; - status = "disabled"; - }; - - gpu_fw_data: gpu-fw-data { - no-map; - status = "disabled"; - }; - }; - - gpu_opp: opp-table-gpu { - compatible = "operating-points-v2"; - - opp00 { - opp-hz = /bits/ 64 <0>; - opp-microvolt = <125000 125000 125000 125000>; - }; - opp01 { - opp-hz = /bits/ 64 <338000000>; - opp-microvolt = <600000 600000 600000 600000>; - }; - opp02 { - opp-hz = /bits/ 64 <618000000>; - opp-microvolt = <665000 665000 660000 660000>; - }; - opp03 { - opp-hz = /bits/ 64 <796000000>; - opp-microvolt = <705000 705000 700000 705000>; - }; - opp04 { - opp-hz = /bits/ 64 <924000000>; - opp-microvolt = <725000 725000 715000 730000>; - }; - opp05 { - opp-hz = /bits/ 64 <952000000>; - opp-microvolt = <770000 770000 770000 780000>; - }; - opp06 { - opp-hz = /bits/ 64 <1056000000>; - opp-microvolt = <770000 770000 770000 780000>; - }; - opp07 { - opp-hz = /bits/ 64 <1062000000>; - opp-microvolt = <810000 810000 805000 810000>; - }; - opp08 { - opp-hz = /bits/ 64 <1182000000>; - opp-microvolt = <810000 810000 805000 810000>; - }; - opp09 { - opp-hz = /bits/ 64 <1182000000>; - opp-microvolt = <860000 860000 860000 860000>; - }; - opp10 { - opp-hz = /bits/ 64 <1312000000>; - opp-microvolt = <860000 860000 860000 860000>; - }; - opp11 { - opp-hz = /bits/ 64 <1242000000>; - opp-microvolt = <900000 895000 900000 900000>; - }; - opp12 { - opp-hz = /bits/ 64 <1380000000>; - opp-microvolt = <900000 895000 900000 900000>; - }; - opp13 { - opp-hz = /bits/ 64 <1326000000>; - opp-microvolt = <940000 925000 940000 940000>; - }; - opp14 { - opp-hz = /bits/ 64 <1470000000>; - opp-microvolt = <940000 925000 940000 940000>; - }; - opp15 { - opp-hz = /bits/ 64 <1578000000>; - opp-microvolt = <1020000 1020000 1020000 1020000>; - }; - }; - - gpu_cs_opp: opp-table-gpucs { - compatible = "operating-points-v2"; - - opp00 { - opp-hz = /bits/ 64 <24000000>; - opp-microvolt = <585000>; - }; - opp01 { - opp-hz = /bits/ 64 <338000000>; - opp-microvolt = <585000>; - }; - opp02 { - opp-hz = /bits/ 64 <618000000>; - opp-microvolt = <635000>; - }; - opp03 { - opp-hz = /bits/ 64 <796000000>; - opp-microvolt = <685000>; - }; - opp04 { - opp-hz = /bits/ 64 <992000000>; - opp-microvolt = <720000>; - }; - opp05 { - opp-hz = /bits/ 64 <1188000000>; - opp-microvolt = <770000>; - }; - opp06 { - opp-hz = /bits/ 64 <1380000000>; - opp-microvolt = <855000>; - }; - opp07 { - opp-hz = /bits/ 64 <1470000000>; - opp-microvolt = <885000>; - }; - }; - - gpu_afr_opp: opp-table-gpuafr { - compatible = "operating-points-v2"; - - opp00 { - opp-hz = /bits/ 64 <24000000>; - opp-microvolt = <585000>; - }; - opp01 { - opp-hz = /bits/ 64 <338000000>; - opp-microvolt = <585000>; - }; - opp02 { - opp-hz = /bits/ 64 <618000000>; - opp-microvolt = <635000>; - }; - opp03 { - opp-hz = /bits/ 64 <796000000>; - opp-microvolt = <685000>; - }; - opp04 { - opp-hz = /bits/ 64 <992000000>; - opp-microvolt = <720000>; - }; - opp05 { - opp-hz = /bits/ 64 <1188000000>; - opp-microvolt = <770000>; - }; - opp06 { - opp-hz = /bits/ 64 <1380000000>; - opp-microvolt = <855000>; - }; - opp07 { - opp-hz = /bits/ 64 <1470000000>; - opp-microvolt = <885000>; - }; - }; -}; - -/* guess: the J616c's operating points, binned per device */ -&gpu { - memory-region = <&gpu_uat_ttbs>, <&gpu_uat_pagetables>, - <&gpu_uat_handoff>, <&gpu_fw_data>, - <&gpu_uat_l2_pagetables>, <&gpu_fw_text>; - memory-region-names = "ttbs", "pagetables", "handoff", "fw-data", - "l2-pagetables", "fw-text"; - operating-points-v2 = <&gpu_opp>; - apple,cs-opp = <&gpu_cs_opp>; - apple,afr-opp = <&gpu_afr_opp>; - apple,firmware-version = <26 5 2>; -}; - -/ { - aliases { - aop = &aop; - }; - speaker_sdz: regulator-sn012776-sdz { - compatible = "regulator-fixed"; - regulator-name = "sn012776-sdz"; - gpios = <&pinctrl 54 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - /* - * The J614s speakers: no bring-up and no protection profile yet, so - * the card and the six amps stay disabled, as on the J614s. - */ - sound: sound { - compatible = "apple,j614-macaudio", "apple,macaudio"; - model = "MacBook Pro J614"; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Speakers"; - dai-tdm-idle-mode-0 = "zero"; - dai-tdm-idle-mode-1 = "zero"; - dai-tdm-slot-tx-idle-mask-0 = <0xf0f0f0>; - dai-tdm-slot-tx-idle-mask-1 = <0x0f0f0f>; - - cpu { - sound-dai = <&aop_audio 3>; - }; - - codec { - sound-dai = <&speaker_left_woof1>, <&speaker_right_woof1>, - <&speaker_left_woof2>, <&speaker_right_woof2>, - <&speaker_left_tweet>, <&speaker_right_tweet>; - }; - }; - }; - - sound_jack: sound-jack { - compatible = "apple,j614-macaudio-jack", "apple,macaudio"; - model = "MacBook Pro J614 Jack"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Headphone Jack"; - - cpu { - sound-dai = <&aop_audio 4>; - }; - - codec { - sound-dai = <&jack_codec>; - }; - }; - }; +&speaker_right_woof2 { + status = "disabled"; }; -&aop { - status = "okay"; +&speaker_right_tweet { + status = "disabled"; }; -&aop_mbox { - status = "okay"; -}; - -&aop_dart { - status = "okay"; -}; - -&admac0 { - status = "okay"; -}; - -&admac1 { - status = "okay"; +&sound_jack { + compatible = "apple,j614-macaudio-jack", "apple,macaudio"; + model = "MacBook Pro J614 Jack"; }; &aop_audio { apple,chassis-name = "J614"; - apple,machine-kind = "MacBook Pro"; -}; - -&i2c1 { - status = "okay"; - - speaker_left_woof1: codec@38 { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x38>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Left Woofer 1"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <0>; - ti,vmon-slot-no = <2>; - status = "disabled"; - }; - - speaker_left_woof2: codec@39 { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x39>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Left Woofer 2"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <8>; - ti,vmon-slot-no = <10>; - status = "disabled"; - }; - - speaker_left_tweet: codec@3a { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3a>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Left Tweeter"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <16>; - ti,vmon-slot-no = <18>; - status = "disabled"; - }; -}; - -&i2c3 { - status = "okay"; - - speaker_right_woof1: codec@3b { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3b>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Right Woofer 1"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <4>; - ti,vmon-slot-no = <6>; - status = "disabled"; - }; - - speaker_right_woof2: codec@3c { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3c>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Right Woofer 2"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <12>; - ti,vmon-slot-no = <14>; - status = "disabled"; - }; - - speaker_right_tweet: codec@3d { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3d>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Right Tweeter"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <20>; - ti,vmon-slot-no = <22>; - status = "disabled"; - }; -}; - -&i2c2 { - status = "okay"; - - jack_codec: codec@4b { - compatible = "cirrus,cs42l84"; - reg = <0x4b>; - reset-gpios = <&pinctrl_nub 58 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - interrupts-extended = <&pinctrl 106 IRQ_TYPE_LEVEL_LOW>; - sound-name-prefix = "Jack"; - }; -}; - -&aop { nonposted-mmio; }; - -&aop_als { status = "disabled"; }; -&aop_las { status = "disabled"; }; - -&admac1 { dma-channels = <26>; nonposted-mmio; }; -&admac0 { nonposted-mmio; }; -&aop_dart { nonposted-mmio; }; -&i2c1 { nonposted-mmio; }; -&i2c2 { nonposted-mmio; }; -&i2c3 { nonposted-mmio; }; - -/ { - reserved-memory { - aop_mmio_pmgr: aop-mmio-pmgr@508304000 { - reg = <0x5 0x08304000 0x0 0x4000>; - iommu-addresses = <&aop 0x5 0x08304000 0x0 0x4000>; - no-map; - }; - }; -}; - -&sep_mbox { - status = "okay"; -}; - -&spi2 { - status = "okay"; }; &mesa { - status = "okay"; - enable-gpios = <&pinctrl_nub 53 GPIO_ACTIVE_HIGH>; - interrupt-parent = <&pinctrl>; - interrupts = <116 IRQ_TYPE_EDGE_RISING>; - spi-cs-setup-delay-ns = <20>; - spi-cs-hold-delay-ns = <20>; firmware-name = "apple/mesacal-j614c.bin", "apple/msrk-j614c.bin"; }; - -&aop { - memory-region = <&aop_mmio_pmgr>; -}; - -#include "hwmon-fan-dual.dtsi" - -&smc_hwmon { - fan-F0Ac { - apple,fan-manual-control; - }; - - fan-F1Ac { - apple,fan-manual-control; - }; -}; - -#include "t604x-extdisp.dtsi" - -/delete-node/ &atcphy0_xbar; -/delete-node/ &atcphy2_xbar; - -#include "t6041-j616c-hdmi.dtsi" -#include "t6041-j616c-usbc.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6041-j616c.dts b/arch/arm64/boot/dts/apple/t6041-j616c.dts index 713cc25859f86..8ebf834264045 100644 --- a/arch/arm64/boot/dts/apple/t6041-j616c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j616c.dts @@ -1,933 +1,57 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT -// Copyright The Asahi Linux Contributors +/* + * Apple MacBook Pro (16-inch, M4 Max, 2024) + * + * target-type: J616c + * + * Copyright The Asahi Linux Contributors + */ /dts-v1/; #include "t6041.dtsi" -#include "t6041-j616c-ane.dtsi" -#include -#include +#include "t6041-j614c-j616c.dtsi" / { compatible = "apple,j616c", "apple,t6041", "apple,arm-platform"; model = "Apple MacBook Pro (16-inch, M4 Max)"; - chassis-type = "laptop"; - - aliases { - serial0 = &serial0; - keyboard = &keyboard; - wifi0 = "/pcie@1cb0000000/pci@0,0/wifi@0,0"; - bluetooth0 = "/pcie@1cb0000000/pci@0,0/bluetooth@0,1"; - mtp = &mtp; - dcp = &dcp; - disp0 = &display; - disp0-piodma = &disp0_piodma; - gpu = &gpu; - sep = &sep; - }; - - chosen { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - stdout-path = "serial0:115200n8"; - - framebuffer0: framebuffer@0 { - compatible = "apple,simple-framebuffer", "simple-framebuffer"; - reg = <0 0 0 0>; - status = "disabled"; - }; - }; - - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - }; - - memory@0 { - device_type = "memory"; - reg = <0 0 0 0>; - }; - - serial0: serial@429200000 { - compatible = "apple,s5l-uart"; - reg = <0x4 0x29200000 0x0 0x1000>; - reg-io-width = <4>; - interrupt-parent = <&aic>; - interrupts = ; - clocks = <&clkref>, <&clkref>; - clock-names = "uart", "clk_uart_baud0"; - }; - - clk_disp0: clock-disp0 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <712000000>; - clock-output-names = "disp0"; - }; - - thermal-zones { - cpu-die-thermal { - polling-delay-passive = <1000>; - polling-delay = <1000>; - thermal-sensors = <&smc_hwmon 0>; - - trips { - cpu_die_passive: cpu-die-passive { - temperature = <113000>; - hysteresis = <5000>; - type = "passive"; - }; - - cpu-die-critical { - temperature = <118000>; - hysteresis = <0>; - type = "critical"; - }; - }; - - cooling-maps { - map-e { - trip = <&cpu_die_passive>; - cooling-device = - <&cpu_e0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_e1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_e2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_e3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - - map-p0 { - trip = <&cpu_die_passive>; - cooling-device = - <&cpu_p00 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p01 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p02 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p03 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p04 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p05 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - - map-p1 { - trip = <&cpu_die_passive>; - cooling-device = - <&cpu_p10 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p11 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p12 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p13 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p14 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, - <&cpu_p15 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; - }; - }; -}; - -&cpufreq_e { - /delete-property/ apple,fast-die-effort; -}; - -&cpufreq_p0 { - /delete-property/ apple,fast-die-effort; -}; - -&cpufreq_p1 { - /delete-property/ apple,fast-die-effort; -}; - -&wdt { - timeout-sec = <140>; -}; - -&smc { - status = "okay"; - - smc_gpio_low: gpio-low { - compatible = "apple,smc-low-gpio"; - gpio-controller; - #gpio-cells = <2>; - }; -}; - -&smc_mbox { - status = "okay"; -}; - -&nub_spmi0 { - status = "okay"; -}; - -&mcc { - status = "okay"; -}; - -&smc_hwmon { - temperature-TCMz { - apple,key-id = "TCMz"; - label = "CPU Die Max"; - }; - temperature-TCMb { apple,key-id = "TCMb"; label = "CPU TCMb"; }; - temperature-Tpx0 { apple,key-id = "Tpx0"; label = "CPU Tpx0"; }; - temperature-Tpx1 { apple,key-id = "Tpx1"; label = "CPU Tpx1"; }; - temperature-Tpx2 { apple,key-id = "Tpx2"; label = "CPU Tpx2"; }; - temperature-Tpx3 { apple,key-id = "Tpx3"; label = "CPU Tpx3"; }; - temperature-Tpx4 { apple,key-id = "Tpx4"; label = "CPU Tpx4"; }; - temperature-Tpx5 { apple,key-id = "Tpx5"; label = "CPU Tpx5"; }; - temperature-Tpx8 { apple,key-id = "Tpx8"; label = "CPU Tpx8"; }; - temperature-Tpx9 { apple,key-id = "Tpx9"; label = "CPU Tpx9"; }; - temperature-TpxA { apple,key-id = "TpxA"; label = "CPU TpxA"; }; - temperature-TpxB { apple,key-id = "TpxB"; label = "CPU TpxB"; }; - temperature-TpxC { apple,key-id = "TpxC"; label = "CPU TpxC"; }; - temperature-TpxD { apple,key-id = "TpxD"; label = "CPU TpxD"; }; - temperature-Tex0 { apple,key-id = "Tex0"; label = "CPU Tex0"; }; - temperature-Tex1 { apple,key-id = "Tex1"; label = "CPU Tex1"; }; - temperature-Tex2 { apple,key-id = "Tex2"; label = "CPU Tex2"; }; - temperature-Tex3 { apple,key-id = "Tex3"; label = "CPU Tex3"; }; - temperature-TH0x { apple,key-id = "TH0x"; label = "NAND Flash Temperature"; }; - temperature-TB0T { apple,key-id = "TB0T"; label = "Battery Hotspot"; }; - temperature-TCHP { apple,key-id = "TCHP"; label = "Charge Regulator Temp"; }; - temperature-TW0P { apple,key-id = "TW0P"; label = "WiFi/BT Module Temp"; }; - power-PSTR { apple,key-id = "PSTR"; label = "Total System Power"; }; - power-PHPC { apple,key-id = "PHPC"; label = "Heatpipe Power"; }; - power-PDTR { apple,key-id = "PDTR"; label = "AC Input Power"; }; - voltage-VD0R { apple,key-id = "VD0R"; label = "AC Input Voltage"; }; - voltage-SBAV { apple,key-id = "SBAV"; label = "Battery Voltage"; }; - current-ID0R { apple,key-id = "ID0R"; label = "AC Input Current"; }; -}; - -&pinctrl { - status = "okay"; - - wifi_clkreq_pins: wifi-clkreq-pins { - pinmux = ; - }; -}; - -&pinctrl_nub { - status = "okay"; - /delete-property/ interrupt-controller; - /delete-property/ #interrupt-cells; - /delete-property/ interrupts; -}; - -&mtp { - status = "okay"; -}; - -&mtp_mbox { - status = "okay"; -}; - -&mtp_dart { - status = "okay"; -}; - -&mtp_dockchannel { - status = "okay"; }; &mtp_hid { - compatible = "apple,dockchannel-hid"; - apple,afe-reset-gpios = <&smc_gpio_low 25 GPIO_ACTIVE_LOW>; - apple,stm-reset-gpios = <&smc_gpio_low 26 GPIO_ACTIVE_LOW>; - multi-touch { firmware-name = "apple/tpmtfw-j616c.bin"; - apple,power-method = <2>; - }; - - keyboard: keyboard { - hid-country-code = <0>; - apple,keyboard-layout-id = <0>; - }; - - stm { - }; - - actuator { - }; - - tp-accel { - }; - - mtp { - }; -}; - -&pcie_dart { - status = "okay"; -}; - -/ { - pcie0: pcie@1cb0000000 { - compatible = "apple,t6041-pcie", "apple,t6020-pcie"; - reg = <0x1c 0xb0000000 0x0 0x1000000>, - <0x4 0x14000000 0x0 0x4000>, - <0x4 0x10028000 0x0 0x4000>, - <0x4 0x11028000 0x0 0x4000>, - <0x4 0x12028000 0x0 0x4000>, - <0x4 0x13028000 0x0 0x4000>, - <0x4 0x17020000 0x0 0x4000>, - <0x4 0x17024000 0x0 0x4000>, - <0x4 0x17028000 0x0 0x4000>, - <0x4 0x1702c000 0x0 0x4000>; - reg-names = "config", "rc", - "port0", "port1", "port2", "port3", - "phy0", "phy1", "phy2", "phy3"; - ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_clkreq_pins>; - #size-cells = <2>; - #address-cells = <3>; - bus-range = <0 1>; - iommu-map-mask = <0xffff>; - iommu-map = <0x100 &pcie_dart 1 2>; - msi-ranges = <&aic AIC_IRQ 2071 IRQ_TYPE_EDGE_RISING 32>; - msi-parent = <&pcie0>; - msi-controller; - interrupts = <0 0x6bb 4>; - interrupt-parent = <&aic>; - device_type = "pci"; - - port00: pci@0,0 { - reg = <0 0 0 0 0>; - ranges; - interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; - interrupt-map-mask = <0 0 0 7>; - #interrupt-cells = <1>; - interrupt-controller; - #size-cells = <2>; - #address-cells = <3>; - pwren-gpios = <&smc_gpio 0x13 0>; - reset-gpios = <&pinctrl 4 1>; - device_type = "pci"; - - bluetooth@0,1 { - compatible = "pci14e4,5f72"; - reg = <0x100 0 0 0 0>; - local-bd-address = [00 00 00 00 00 00]; - brcm,board-type = "apple,hostomel"; - status = "okay"; - }; - - wifi@0,0 { - compatible = "pci14e4,4434", "brcm,bcm4329-fmac"; - reg = <0 0 0 0 0>; - brcm,ccode-map-trivial; - brcm,board-type = "apple,hostomel"; - }; - }; - }; -}; - -&ans_mbox { - status = "okay"; -}; - -&ans_sart { - status = "okay"; -}; - -&nvme { - status = "okay"; -}; - -&display { - phandle = <&display>; - status = "okay"; -}; - -&dcp { - clocks = <&clk_disp0>; - phandle = <&dcp>; - - panel { - compatible = "apple,panel-j616", "apple,panel-mini-led", "apple,panel"; - width-mm = <346>; - height-mm = <223>; - adj-height-mm = <216>; - apple,max-brightness = <500>; - /* "Wide color (P3)" in the Apple technical specifications */ - apple,color-gamut = "display-p3"; - }; -}; - -&disp0_piodma { - phandle = <&disp0_piodma>; -}; - -&nub_spmi_a0 { - status = "okay"; - - hpm1: usb-pd@a { - compatible = "apple,sn201202x"; - reg = <0xa SPMI_USID>; - interrupts = <37 IRQ_TYPE_EDGE_RISING>, - <39 IRQ_TYPE_EDGE_RISING>, - <43 IRQ_TYPE_EDGE_RISING>, - <45 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "select", "sleep", "wake"; - - typec1: connector { - compatible = "usb-c-connector"; - label = "USB-C Left Front"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec1_con_hs: endpoint { - remote-endpoint = <&usb_drd1_hs>; - }; - }; - }; - }; - }; -}; - -&nub_spmi_a1 { - status = "okay"; - - hpm2: usb-pd@c { - compatible = "apple,sn201202x"; - reg = <0xc SPMI_USID>; - interrupts = <11 IRQ_TYPE_EDGE_RISING>, - <13 IRQ_TYPE_EDGE_RISING>, - <17 IRQ_TYPE_EDGE_RISING>, - <19 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "irq", "select", "sleep", "wake"; - - typec2: connector { - compatible = "usb-c-connector"; - label = "USB-C Right"; - power-role = "dual"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - typec2_con_hs: endpoint { - remote-endpoint = <&usb_drd2_hs>; - }; - }; - }; - }; - }; -}; - -&atcphy1 { - apple,tunable-usb2-host = <0x8 0x7003 0x3>; - status = "okay"; -}; - -&usb_drd1_dart_0 { - status = "okay"; -}; - -&usb_drd1_dart_1 { - status = "okay"; -}; - -&usb_drd1 { - maximum-speed = "high-speed"; - phys = <&atcphy1 PHY_TYPE_USB2>; - phy-names = "usb2-phy"; - apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, - <0x2c 0x000a07ff 0x000800c8>, <0x100 0x02000100 0x02000100>, - <0x504 0x00001000 0x0>, <0x528 0xff0000ff 0x06000006>, - <0x52c 0xff0000ff 0x08000008>, <0x538 0x00000800 0x00000800>, - <0x580 0xffffffff 0x6f000006>; - apple,tunable-cfg-host = <0x20 0xff 0x1b>; - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usb_drd1_hs: endpoint { - remote-endpoint = <&typec1_con_hs>; - }; - }; - }; -}; - -&atcphy2 { - apple,tunable-usb2-host = <0x8 0x7003 0x3>; - status = "okay"; -}; - -&usb_drd2_dart_0 { - status = "okay"; -}; - -&usb_drd2_dart_1 { - status = "okay"; -}; - -&usb_drd2 { - maximum-speed = "high-speed"; - phys = <&atcphy2 PHY_TYPE_USB2>; - phy-names = "usb2-phy"; - apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, - <0x2c 0x000a07ff 0x000800c8>, <0x100 0x02000100 0x02000100>, - <0x504 0x00001000 0x0>, <0x528 0xff0000ff 0x06000006>, - <0x52c 0xff0000ff 0x08000008>, <0x538 0x00000800 0x00000800>, - <0x580 0xffffffff 0x6f000006>; - apple,tunable-cfg-host = <0x20 0xff 0x1b>; - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usb_drd2_hs: endpoint { - remote-endpoint = <&typec2_con_hs>; - }; - }; - }; -}; - -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - gpu_uat_ttbs: uat-ttbs { - no-map; - status = "disabled"; - }; - - gpu_uat_pagetables: uat-pagetables { - no-map; - status = "disabled"; - }; - - gpu_uat_l2_pagetables: uat-l2-pagetables { - no-map; - status = "disabled"; - }; - - gpu_uat_handoff: uat-handoff { - no-map; - status = "disabled"; - }; - - gpu_fw_text: gpu-fw-text { - no-map; - status = "disabled"; - }; - - gpu_fw_data: gpu-fw-data { - no-map; - status = "disabled"; - }; - }; - - gpu_opp: opp-table-gpu { - compatible = "operating-points-v2"; - - opp00 { - opp-hz = /bits/ 64 <0>; - opp-microvolt = <125000 125000 125000 125000>; - }; - opp01 { - opp-hz = /bits/ 64 <338000000>; - opp-microvolt = <600000 600000 600000 600000>; - }; - opp02 { - opp-hz = /bits/ 64 <618000000>; - opp-microvolt = <665000 665000 660000 660000>; - }; - opp03 { - opp-hz = /bits/ 64 <796000000>; - opp-microvolt = <705000 705000 700000 705000>; - }; - opp04 { - opp-hz = /bits/ 64 <924000000>; - opp-microvolt = <725000 725000 715000 730000>; - }; - opp05 { - opp-hz = /bits/ 64 <952000000>; - opp-microvolt = <770000 770000 770000 780000>; - }; - opp06 { - opp-hz = /bits/ 64 <1056000000>; - opp-microvolt = <770000 770000 770000 780000>; - }; - opp07 { - opp-hz = /bits/ 64 <1062000000>; - opp-microvolt = <810000 810000 805000 810000>; - }; - opp08 { - opp-hz = /bits/ 64 <1182000000>; - opp-microvolt = <810000 810000 805000 810000>; - }; - opp09 { - opp-hz = /bits/ 64 <1182000000>; - opp-microvolt = <860000 860000 860000 860000>; - }; - opp10 { - opp-hz = /bits/ 64 <1312000000>; - opp-microvolt = <860000 860000 860000 860000>; - }; - opp11 { - opp-hz = /bits/ 64 <1242000000>; - opp-microvolt = <900000 895000 900000 900000>; - }; - opp12 { - opp-hz = /bits/ 64 <1380000000>; - opp-microvolt = <900000 895000 900000 900000>; - }; - opp13 { - opp-hz = /bits/ 64 <1326000000>; - opp-microvolt = <940000 925000 940000 940000>; - }; - opp14 { - opp-hz = /bits/ 64 <1470000000>; - opp-microvolt = <940000 925000 940000 940000>; - }; - opp15 { - opp-hz = /bits/ 64 <1578000000>; - opp-microvolt = <1020000 1020000 1020000 1020000>; - }; - }; - - gpu_cs_opp: opp-table-gpucs { - compatible = "operating-points-v2"; - - opp00 { - opp-hz = /bits/ 64 <24000000>; - opp-microvolt = <585000>; - }; - opp01 { - opp-hz = /bits/ 64 <338000000>; - opp-microvolt = <585000>; - }; - opp02 { - opp-hz = /bits/ 64 <618000000>; - opp-microvolt = <635000>; - }; - opp03 { - opp-hz = /bits/ 64 <796000000>; - opp-microvolt = <685000>; - }; - opp04 { - opp-hz = /bits/ 64 <992000000>; - opp-microvolt = <720000>; - }; - opp05 { - opp-hz = /bits/ 64 <1188000000>; - opp-microvolt = <770000>; - }; - opp06 { - opp-hz = /bits/ 64 <1380000000>; - opp-microvolt = <855000>; - }; - opp07 { - opp-hz = /bits/ 64 <1470000000>; - opp-microvolt = <885000>; - }; - }; - - gpu_afr_opp: opp-table-gpuafr { - compatible = "operating-points-v2"; - - opp00 { - opp-hz = /bits/ 64 <24000000>; - opp-microvolt = <585000>; - }; - opp01 { - opp-hz = /bits/ 64 <338000000>; - opp-microvolt = <585000>; - }; - opp02 { - opp-hz = /bits/ 64 <618000000>; - opp-microvolt = <635000>; - }; - opp03 { - opp-hz = /bits/ 64 <796000000>; - opp-microvolt = <685000>; - }; - opp04 { - opp-hz = /bits/ 64 <992000000>; - opp-microvolt = <720000>; - }; - opp05 { - opp-hz = /bits/ 64 <1188000000>; - opp-microvolt = <770000>; - }; - opp06 { - opp-hz = /bits/ 64 <1380000000>; - opp-microvolt = <855000>; - }; - opp07 { - opp-hz = /bits/ 64 <1470000000>; - opp-microvolt = <885000>; - }; - }; -}; - -&gpu { - memory-region = <&gpu_uat_ttbs>, <&gpu_uat_pagetables>, - <&gpu_uat_handoff>, <&gpu_fw_data>, - <&gpu_uat_l2_pagetables>, <&gpu_fw_text>; - memory-region-names = "ttbs", "pagetables", "handoff", "fw-data", - "l2-pagetables", "fw-text"; - operating-points-v2 = <&gpu_opp>; - apple,cs-opp = <&gpu_cs_opp>; - apple,afr-opp = <&gpu_afr_opp>; - apple,firmware-version = <26 5 2>; -}; - -/ { - aliases { - aop = &aop; - }; - speaker_sdz: regulator-sn012776-sdz { - compatible = "regulator-fixed"; - regulator-name = "sn012776-sdz"; - gpios = <&pinctrl 54 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - sound: sound { - compatible = "apple,j616-macaudio", "apple,macaudio"; - model = "MacBook Pro J616"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Speakers"; - dai-tdm-idle-mode-0 = "zero"; - dai-tdm-idle-mode-1 = "zero"; - dai-tdm-slot-tx-idle-mask-0 = <0xf0f0f0>; - dai-tdm-slot-tx-idle-mask-1 = <0x0f0f0f>; - - cpu { - sound-dai = <&aop_audio 3>; - }; - - codec { - sound-dai = <&speaker_left_woof1>, <&speaker_right_woof1>, - <&speaker_left_woof2>, <&speaker_right_woof2>, - <&speaker_left_tweet>, <&speaker_right_tweet>; - }; - }; - }; - - sound_jack: sound-jack { - compatible = "apple,j616-macaudio-jack", "apple,macaudio"; - model = "MacBook Pro J616 Jack"; - #address-cells = <1>; - #size-cells = <0>; - - dai-link@0 { - reg = <0>; - link-name = "Headphone Jack"; - - cpu { - sound-dai = <&aop_audio 4>; - }; - - codec { - sound-dai = <&jack_codec>; - }; - }; }; }; -&aop { - status = "okay"; +&wifi0 { + brcm,board-type = "apple,hostomel"; }; -&aop_mbox { - status = "okay"; +&bluetooth0 { + brcm,board-type = "apple,hostomel"; }; -&aop_dart { - status = "okay"; +&panel { + compatible = "apple,panel-j616", "apple,panel-mini-led", "apple,panel"; + width-mm = <346>; + height-mm = <223>; + adj-height-mm = <216>; }; -&admac0 { - status = "okay"; +&sound { + compatible = "apple,j616-macaudio", "apple,macaudio"; + model = "MacBook Pro J616"; }; -&admac1 { - status = "okay"; +&sound_jack { + compatible = "apple,j616-macaudio-jack", "apple,macaudio"; + model = "MacBook Pro J616 Jack"; }; &aop_audio { apple,chassis-name = "J616"; - apple,machine-kind = "MacBook Pro"; -}; - -&i2c1 { - status = "okay"; - - speaker_left_woof1: codec@38 { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x38>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Left Woofer 1"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <0>; - ti,vmon-slot-no = <2>; - }; - - speaker_left_woof2: codec@39 { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x39>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Left Woofer 2"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <8>; - ti,vmon-slot-no = <10>; - }; - - speaker_left_tweet: codec@3a { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3a>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Left Tweeter"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <16>; - ti,vmon-slot-no = <18>; - }; -}; - -&i2c3 { - status = "okay"; - - speaker_right_woof1: codec@3b { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3b>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Right Woofer 1"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <4>; - ti,vmon-slot-no = <6>; - }; - - speaker_right_woof2: codec@3c { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3c>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Right Woofer 2"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <12>; - ti,vmon-slot-no = <14>; - }; - - speaker_right_tweet: codec@3d { - compatible = "ti,sn012776", "ti,tas2764"; - reg = <0x3d>; - SDZ-supply = <&speaker_sdz>; - apple,sdz-group-fail-closed; - #sound-dai-cells = <0>; - sound-name-prefix = "Right Tweeter"; - interrupts-extended = <&pinctrl 55 IRQ_TYPE_LEVEL_LOW>; - ti,imon-slot-no = <20>; - ti,vmon-slot-no = <22>; - }; -}; - -&i2c2 { - status = "okay"; - - jack_codec: codec@4b { - compatible = "cirrus,cs42l84"; - reg = <0x4b>; - reset-gpios = <&pinctrl_nub 58 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - interrupts-extended = <&pinctrl 106 IRQ_TYPE_LEVEL_LOW>; - sound-name-prefix = "Jack"; - }; -}; - -&aop { nonposted-mmio; }; - -&aop_als { status = "disabled"; }; -&aop_las { status = "disabled"; }; - -&admac1 { dma-channels = <26>; nonposted-mmio; }; -&admac0 { nonposted-mmio; }; -&aop_dart { nonposted-mmio; }; -&i2c1 { nonposted-mmio; }; -&i2c2 { nonposted-mmio; }; -&i2c3 { nonposted-mmio; }; - -/ { - reserved-memory { - aop_mmio_pmgr: aop-mmio-pmgr@508304000 { - reg = <0x5 0x08304000 0x0 0x4000>; - iommu-addresses = <&aop 0x5 0x08304000 0x0 0x4000>; - no-map; - }; - }; -}; - -&sep_mbox { - status = "okay"; -}; - -&spi2 { - status = "okay"; }; &mesa { - status = "okay"; - enable-gpios = <&pinctrl_nub 53 GPIO_ACTIVE_HIGH>; - interrupt-parent = <&pinctrl>; - interrupts = <116 IRQ_TYPE_EDGE_RISING>; - spi-cs-setup-delay-ns = <20>; - spi-cs-hold-delay-ns = <20>; firmware-name = "apple/mesacal-j616c.bin", "apple/msrk-j616c.bin"; }; - -&aop { - memory-region = <&aop_mmio_pmgr>; -}; - -#include "hwmon-fan-dual.dtsi" - -&smc_hwmon { - fan-F0Ac { - apple,fan-manual-control; - }; - - fan-F1Ac { - apple,fan-manual-control; - }; -}; - -#include "t604x-extdisp.dtsi" - -/delete-node/ &atcphy0_xbar; -/delete-node/ &atcphy2_xbar; - -#include "t6041-j616c-hdmi.dtsi" -#include "t6041-j616c-usbc.dtsi" From fa1e8ad74ff1ab877bd671344f4667fb0849c03b Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:42:05 -0500 Subject: [PATCH 12/17] arm64: dts: apple: t604x, t8132: use the common USB and GPU labels The T604x trees label their USB controllers usb_drdN, their Type-C endpoints typecN_con_hs/ss/tbt and the GPU mailbox gfx_mbox, where every other Apple tree, the T8132 included, uses dwc3_N, typecN_connector_hs/ss and agx_mbox. Rename them, and the J713's typecN_con_tbt to typecN_connector_tbt. A tree that still uses the old labels can be converted with: perl -pi -e 's/\busb_drd(\d+)/dwc3_$1/g; s/\btypec(\d)_con_(hs|ss|tbt)\b/typec$1_connector_$2/g; s/\bgfx_mbox\b/agx_mbox/g' No output change: labels are not in these dtbs, which are byte-identical. Signed-off-by: Diljit Singh --- .../boot/dts/apple/t6040-j616s-tether.dts | 6 +- .../boot/dts/apple/t6040-j616s-usb3.dtsi | 6 +- .../boot/dts/apple/t6040-j773s-usb-front.dtsi | 8 +-- arch/arm64/boot/dts/apple/t6040-j773s.dts | 68 +++++++++---------- arch/arm64/boot/dts/apple/t6040.dtsi | 16 ++--- arch/arm64/boot/dts/apple/t6041-j575c.dts | 42 ++++++------ .../boot/dts/apple/t6041-j614c-j616c.dtsi | 28 ++++---- .../boot/dts/apple/t6041-j616c-usbc.dtsi | 4 +- arch/arm64/boot/dts/apple/t6041.dtsi | 4 +- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 68 +++++++++---------- arch/arm64/boot/dts/apple/t604x.dtsi | 24 +++---- .../arm64/boot/dts/apple/t8132-j713-usb4.dtsi | 8 +-- 12 files changed, 141 insertions(+), 141 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s-tether.dts b/arch/arm64/boot/dts/apple/t6040-j616s-tether.dts index 8027360847204..658ce752338db 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s-tether.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s-tether.dts @@ -36,14 +36,14 @@ status = "disabled"; }; -&usb_drd0 { +&dwc3_0 { status = "disabled"; }; -&usb_drd0_dart_0 { +&dwc3_0_dart_0 { status = "disabled"; }; -&usb_drd0_dart_1 { +&dwc3_0_dart_1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/apple/t6040-j616s-usb3.dtsi b/arch/arm64/boot/dts/apple/t6040-j616s-usb3.dtsi index dc4a6b0cb5be2..a8d5d38313628 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s-usb3.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j616s-usb3.dtsi @@ -543,7 +543,7 @@ apple,tunable-usb2-host = <0x8 0x7003 0x3>; }; -&usb_drd0 { +&dwc3_0 { /* DRD_USB31_GBL_DEFAULT, then GCTL.PWRDNSCALE = 0xd as macOS's controller reset() sets it */ apple,tunable-gbl-default = <0x64 0x2 0x0>, <0x10 0xfff80000 0x00680000>; apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, @@ -557,7 +557,7 @@ <0x60 0x0003ffff 0x00000600>; }; -&usb_drd1 { +&dwc3_1 { /* DRD_USB31_GBL_DEFAULT, then GCTL.PWRDNSCALE = 0xd as macOS's controller reset() sets it */ apple,tunable-gbl-default = <0x64 0x2 0x0>, <0x10 0xfff80000 0x00680000>; apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, @@ -571,7 +571,7 @@ <0x60 0x0003ffff 0x00000600>; }; -&usb_drd2 { +&dwc3_2 { /* DRD_USB31_GBL_DEFAULT, then GCTL.PWRDNSCALE = 0xd as macOS's controller reset() sets it */ apple,tunable-gbl-default = <0x64 0x2 0x0>, <0x10 0xfff80000 0x00680000>; apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>, diff --git a/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi b/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi index e52308d370bbc..14287eb390611 100644 --- a/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi @@ -229,7 +229,7 @@ status = "disabled"; }; - usb_drd3_dart_0: iommu@39af00000 { + dwc3_3_dart_0: iommu@39af00000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x9af00000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -240,7 +240,7 @@ status = "disabled"; }; - usb_drd3_dart_1: iommu@39af80000 { + dwc3_3_dart_1: iommu@39af80000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x9af80000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -251,7 +251,7 @@ status = "disabled"; }; - usb_drd3: usb@39a280000 { + dwc3_3: usb@39a280000 { compatible = "apple,t6040-dwc3", "apple,t8103-dwc3"; reg = <0x3 0x9a280000 0x0 0xcd00>, <0x3 0x9a28cd00 0x0 0x3200>, @@ -260,7 +260,7 @@ interrupt-parent = <&aic>; interrupts = ; dr_mode = "host"; - iommus = <&usb_drd3_dart_0 0>, <&usb_drd3_dart_1 1>; + iommus = <&dwc3_3_dart_0 0>, <&dwc3_3_dart_1 1>; power-domains = <&ps_atc3_usb>; resets = <&atcphy3>; phys = <&atcphy3 PHY_TYPE_USB2>, <&atcphy3 PHY_TYPE_USB3>; diff --git a/arch/arm64/boot/dts/apple/t6040-j773s.dts b/arch/arm64/boot/dts/apple/t6040-j773s.dts index 735a81e99db5e..15771fb425ab1 100644 --- a/arch/arm64/boot/dts/apple/t6040-j773s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j773s.dts @@ -484,7 +484,7 @@ }; /* The loader fills the operating points, calibration and all six memory regions. */ -&gfx_mbox { +&agx_mbox { status = "okay"; }; @@ -529,14 +529,14 @@ port@0 { reg = <0>; - typec0_con_hs: endpoint { - remote-endpoint = <&usb_drd0_hs>; + typec0_connector_hs: endpoint { + remote-endpoint = <&dwc3_0_hs>; }; }; port@1 { reg = <1>; - typec0_con_ss: endpoint { + typec0_connector_ss: endpoint { remote-endpoint = <&atcphy0_ss>; }; }; @@ -565,14 +565,14 @@ port@0 { reg = <0>; - typec1_con_hs: endpoint { - remote-endpoint = <&usb_drd1_hs>; + typec1_connector_hs: endpoint { + remote-endpoint = <&dwc3_1_hs>; }; }; port@1 { reg = <1>; - typec1_con_ss: endpoint { + typec1_connector_ss: endpoint { remote-endpoint = <&atcphy1_ss>; }; }; @@ -601,14 +601,14 @@ port@0 { reg = <0>; - typec2_con_hs: endpoint { - remote-endpoint = <&usb_drd2_hs>; + typec2_connector_hs: endpoint { + remote-endpoint = <&dwc3_2_hs>; }; }; port@1 { reg = <1>; - typec2_con_ss: endpoint { + typec2_connector_ss: endpoint { remote-endpoint = <&atcphy2_ss>; }; }; @@ -627,14 +627,14 @@ port@0 { reg = <0>; atcphy0_ss: endpoint { - remote-endpoint = <&typec0_con_ss>; + remote-endpoint = <&typec0_connector_ss>; }; }; port@1 { reg = <1>; atcphy0_usb3: endpoint { - remote-endpoint = <&usb_drd0_ss>; + remote-endpoint = <&dwc3_0_ss>; }; }; }; @@ -644,15 +644,15 @@ status = "okay"; }; -&usb_drd0_dart_0 { +&dwc3_0_dart_0 { status = "okay"; }; -&usb_drd0_dart_1 { +&dwc3_0_dart_1 { status = "okay"; }; -&usb_drd0 { +&dwc3_0 { status = "okay"; ports { @@ -661,14 +661,14 @@ port@0 { reg = <0>; - usb_drd0_hs: endpoint { - remote-endpoint = <&typec0_con_hs>; + dwc3_0_hs: endpoint { + remote-endpoint = <&typec0_connector_hs>; }; }; port@1 { reg = <1>; - usb_drd0_ss: endpoint { + dwc3_0_ss: endpoint { remote-endpoint = <&atcphy0_usb3>; }; }; @@ -685,14 +685,14 @@ port@0 { reg = <0>; atcphy1_ss: endpoint { - remote-endpoint = <&typec1_con_ss>; + remote-endpoint = <&typec1_connector_ss>; }; }; port@1 { reg = <1>; atcphy1_usb3: endpoint { - remote-endpoint = <&usb_drd1_ss>; + remote-endpoint = <&dwc3_1_ss>; }; }; }; @@ -702,15 +702,15 @@ status = "okay"; }; -&usb_drd1_dart_0 { +&dwc3_1_dart_0 { status = "okay"; }; -&usb_drd1_dart_1 { +&dwc3_1_dart_1 { status = "okay"; }; -&usb_drd1 { +&dwc3_1 { status = "okay"; ports { @@ -719,14 +719,14 @@ port@0 { reg = <0>; - usb_drd1_hs: endpoint { - remote-endpoint = <&typec1_con_hs>; + dwc3_1_hs: endpoint { + remote-endpoint = <&typec1_connector_hs>; }; }; port@1 { reg = <1>; - usb_drd1_ss: endpoint { + dwc3_1_ss: endpoint { remote-endpoint = <&atcphy1_usb3>; }; }; @@ -743,14 +743,14 @@ port@0 { reg = <0>; atcphy2_ss: endpoint { - remote-endpoint = <&typec2_con_ss>; + remote-endpoint = <&typec2_connector_ss>; }; }; port@1 { reg = <1>; atcphy2_usb3: endpoint { - remote-endpoint = <&usb_drd2_ss>; + remote-endpoint = <&dwc3_2_ss>; }; }; }; @@ -760,15 +760,15 @@ status = "okay"; }; -&usb_drd2_dart_0 { +&dwc3_2_dart_0 { status = "okay"; }; -&usb_drd2_dart_1 { +&dwc3_2_dart_1 { status = "okay"; }; -&usb_drd2 { +&dwc3_2 { status = "okay"; ports { @@ -777,14 +777,14 @@ port@0 { reg = <0>; - usb_drd2_hs: endpoint { - remote-endpoint = <&typec2_con_hs>; + dwc3_2_hs: endpoint { + remote-endpoint = <&typec2_connector_hs>; }; }; port@1 { reg = <1>; - usb_drd2_ss: endpoint { + dwc3_2_ss: endpoint { remote-endpoint = <&atcphy2_usb3>; }; }; diff --git a/arch/arm64/boot/dts/apple/t6040.dtsi b/arch/arm64/boot/dts/apple/t6040.dtsi index 40d48e6563bf0..4a16ead7f6e22 100644 --- a/arch/arm64/boot/dts/apple/t6040.dtsi +++ b/arch/arm64/boot/dts/apple/t6040.dtsi @@ -217,13 +217,13 @@ reg = <0x2 0x8a600000 0x0 0x88000>, <0x2 0x88000000 0x0 0x3758000>; reg-names = "asc", "sgx"; - mboxes = <&gfx_mbox>; + mboxes = <&agx_mbox>; power-domains = <&pmp_gfx>; apple,clpc = <&clpc>; status = "disabled"; }; - gfx_mbox: mailbox@28a600000 { + agx_mbox: mailbox@28a600000 { compatible = "apple,t6040-ascwrap-v6"; reg = <0x2 0x8a600000 0x0 0x88000>, <0x2 0x8a050000 0x0 0x8>; @@ -561,27 +561,27 @@ power-domain-names = "dma", "pipe4", "pipe5", "me0", "me1", "perf"; }; -&usb_drd0_dart_0 { +&dwc3_0_dart_0 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; -&usb_drd0_dart_1 { +&dwc3_0_dart_1 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; -&usb_drd1_dart_0 { +&dwc3_1_dart_0 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; -&usb_drd1_dart_1 { +&dwc3_1_dart_1 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; -&usb_drd2_dart_0 { +&dwc3_2_dart_0 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; -&usb_drd2_dart_1 { +&dwc3_2_dart_1 { apple,dma-range = <0x100 0x4000 0x0 0xffff0000>; }; diff --git a/arch/arm64/boot/dts/apple/t6041-j575c.dts b/arch/arm64/boot/dts/apple/t6041-j575c.dts index 472293f83ae31..85acbc4f0ae8f 100644 --- a/arch/arm64/boot/dts/apple/t6041-j575c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j575c.dts @@ -407,8 +407,8 @@ port@0 { reg = <0>; - typec0_con_hs: endpoint { - remote-endpoint = <&usb_drd0_hs>; + typec0_connector_hs: endpoint { + remote-endpoint = <&dwc3_0_hs>; }; }; }; @@ -436,8 +436,8 @@ port@0 { reg = <0>; - typec1_con_hs: endpoint { - remote-endpoint = <&usb_drd1_hs>; + typec1_connector_hs: endpoint { + remote-endpoint = <&dwc3_1_hs>; }; }; }; @@ -465,8 +465,8 @@ port@0 { reg = <0>; - typec2_con_hs: endpoint { - remote-endpoint = <&usb_drd2_hs>; + typec2_connector_hs: endpoint { + remote-endpoint = <&dwc3_2_hs>; }; }; }; @@ -479,15 +479,15 @@ status = "okay"; }; -&usb_drd0_dart_0 { +&dwc3_0_dart_0 { status = "okay"; }; -&usb_drd0_dart_1 { +&dwc3_0_dart_1 { status = "okay"; }; -&usb_drd0 { +&dwc3_0 { maximum-speed = "high-speed"; phys = <&atcphy0 PHY_TYPE_USB2>; phy-names = "usb2-phy"; @@ -505,8 +505,8 @@ port@0 { reg = <0>; - usb_drd0_hs: endpoint { - remote-endpoint = <&typec0_con_hs>; + dwc3_0_hs: endpoint { + remote-endpoint = <&typec0_connector_hs>; }; }; }; @@ -517,15 +517,15 @@ status = "okay"; }; -&usb_drd1_dart_0 { +&dwc3_1_dart_0 { status = "okay"; }; -&usb_drd1_dart_1 { +&dwc3_1_dart_1 { status = "okay"; }; -&usb_drd1 { +&dwc3_1 { maximum-speed = "high-speed"; phys = <&atcphy1 PHY_TYPE_USB2>; phy-names = "usb2-phy"; @@ -543,8 +543,8 @@ port@0 { reg = <0>; - usb_drd1_hs: endpoint { - remote-endpoint = <&typec1_con_hs>; + dwc3_1_hs: endpoint { + remote-endpoint = <&typec1_connector_hs>; }; }; }; @@ -555,15 +555,15 @@ status = "okay"; }; -&usb_drd2_dart_0 { +&dwc3_2_dart_0 { status = "okay"; }; -&usb_drd2_dart_1 { +&dwc3_2_dart_1 { status = "okay"; }; -&usb_drd2 { +&dwc3_2 { maximum-speed = "high-speed"; phys = <&atcphy2 PHY_TYPE_USB2>; phy-names = "usb2-phy"; @@ -581,8 +581,8 @@ port@0 { reg = <0>; - usb_drd2_hs: endpoint { - remote-endpoint = <&typec2_con_hs>; + dwc3_2_hs: endpoint { + remote-endpoint = <&typec2_connector_hs>; }; }; }; diff --git a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi index c8ab8c8165993..d703e206e0a2b 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi +++ b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi @@ -380,8 +380,8 @@ port@0 { reg = <0>; - typec1_con_hs: endpoint { - remote-endpoint = <&usb_drd1_hs>; + typec1_connector_hs: endpoint { + remote-endpoint = <&dwc3_1_hs>; }; }; }; @@ -413,8 +413,8 @@ port@0 { reg = <0>; - typec2_con_hs: endpoint { - remote-endpoint = <&usb_drd2_hs>; + typec2_connector_hs: endpoint { + remote-endpoint = <&dwc3_2_hs>; }; }; }; @@ -427,15 +427,15 @@ status = "okay"; }; -&usb_drd1_dart_0 { +&dwc3_1_dart_0 { status = "okay"; }; -&usb_drd1_dart_1 { +&dwc3_1_dart_1 { status = "okay"; }; -&usb_drd1 { +&dwc3_1 { maximum-speed = "high-speed"; phys = <&atcphy1 PHY_TYPE_USB2>; phy-names = "usb2-phy"; @@ -453,8 +453,8 @@ port@0 { reg = <0>; - usb_drd1_hs: endpoint { - remote-endpoint = <&typec1_con_hs>; + dwc3_1_hs: endpoint { + remote-endpoint = <&typec1_connector_hs>; }; }; }; @@ -465,15 +465,15 @@ status = "okay"; }; -&usb_drd2_dart_0 { +&dwc3_2_dart_0 { status = "okay"; }; -&usb_drd2_dart_1 { +&dwc3_2_dart_1 { status = "okay"; }; -&usb_drd2 { +&dwc3_2 { maximum-speed = "high-speed"; phys = <&atcphy2 PHY_TYPE_USB2>; phy-names = "usb2-phy"; @@ -491,8 +491,8 @@ port@0 { reg = <0>; - usb_drd2_hs: endpoint { - remote-endpoint = <&typec2_con_hs>; + dwc3_2_hs: endpoint { + remote-endpoint = <&typec2_connector_hs>; }; }; }; diff --git a/arch/arm64/boot/dts/apple/t6041-j616c-usbc.dtsi b/arch/arm64/boot/dts/apple/t6041-j616c-usbc.dtsi index 4ccf897e1dd01..35f6bfc990e8d 100644 --- a/arch/arm64/boot/dts/apple/t6041-j616c-usbc.dtsi +++ b/arch/arm64/boot/dts/apple/t6041-j616c-usbc.dtsi @@ -66,7 +66,7 @@ ports { port@1 { reg = <1>; - typec1_con_ss: endpoint { + typec1_connector_ss: endpoint { remote-endpoint = <&atcphy1_ss>; }; }; @@ -260,7 +260,7 @@ port { atcphy1_ss: endpoint { - remote-endpoint = <&typec1_con_ss>; + remote-endpoint = <&typec1_connector_ss>; }; }; }; diff --git a/arch/arm64/boot/dts/apple/t6041.dtsi b/arch/arm64/boot/dts/apple/t6041.dtsi index 77cf66abf0f97..cedebb355bd3e 100644 --- a/arch/arm64/boot/dts/apple/t6041.dtsi +++ b/arch/arm64/boot/dts/apple/t6041.dtsi @@ -306,12 +306,12 @@ reg = <0x2 0x8a600000 0x0 0x88000>, <0x2 0x88000000 0x0 0x3758000>; reg-names = "asc", "sgx"; - mboxes = <&gfx_mbox>; + mboxes = <&agx_mbox>; power-domains = <&ps_gfx>; status = "disabled"; }; - gfx_mbox: mailbox@28a600000 { + agx_mbox: mailbox@28a600000 { compatible = "apple,t6040-ascwrap-v6"; reg = <0x2 0x8a600000 0x0 0x88000>, <0x2 0x8a050000 0x0 0x8>; diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index c3bfa3a66f459..0b3d6b030ee90 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -2946,7 +2946,7 @@ }; /* The loader fills the operating points, calibration and all six memory regions. */ -&gfx_mbox { +&agx_mbox { status = "okay"; }; @@ -2992,14 +2992,14 @@ port@0 { reg = <0>; - typec0_con_hs: endpoint { - remote-endpoint = <&usb_drd0_hs>; + typec0_connector_hs: endpoint { + remote-endpoint = <&dwc3_0_hs>; }; }; port@1 { reg = <1>; - typec0_con_ss: endpoint { + typec0_connector_ss: endpoint { remote-endpoint = <&atcphy0_ss>; }; }; @@ -3028,14 +3028,14 @@ port@0 { reg = <0>; - typec1_con_hs: endpoint { - remote-endpoint = <&usb_drd1_hs>; + typec1_connector_hs: endpoint { + remote-endpoint = <&dwc3_1_hs>; }; }; port@1 { reg = <1>; - typec1_con_ss: endpoint { + typec1_connector_ss: endpoint { remote-endpoint = <&atcphy1_ss>; }; }; @@ -3079,14 +3079,14 @@ port@0 { reg = <0>; - typec2_con_hs: endpoint { - remote-endpoint = <&usb_drd2_hs>; + typec2_connector_hs: endpoint { + remote-endpoint = <&dwc3_2_hs>; }; }; port@1 { reg = <1>; - typec2_con_ss: endpoint { + typec2_connector_ss: endpoint { remote-endpoint = <&atcphy2_ss>; }; }; @@ -3105,14 +3105,14 @@ port@0 { reg = <0>; atcphy0_ss: endpoint { - remote-endpoint = <&typec0_con_ss>; + remote-endpoint = <&typec0_connector_ss>; }; }; port@1 { reg = <1>; atcphy0_usb3: endpoint { - remote-endpoint = <&usb_drd0_ss>; + remote-endpoint = <&dwc3_0_ss>; }; }; }; @@ -3122,15 +3122,15 @@ status = "okay"; }; -&usb_drd0_dart_0 { +&dwc3_0_dart_0 { status = "okay"; }; -&usb_drd0_dart_1 { +&dwc3_0_dart_1 { status = "okay"; }; -&usb_drd0 { +&dwc3_0 { status = "okay"; ports { @@ -3139,14 +3139,14 @@ port@0 { reg = <0>; - usb_drd0_hs: endpoint { - remote-endpoint = <&typec0_con_hs>; + dwc3_0_hs: endpoint { + remote-endpoint = <&typec0_connector_hs>; }; }; port@1 { reg = <1>; - usb_drd0_ss: endpoint { + dwc3_0_ss: endpoint { remote-endpoint = <&atcphy0_usb3>; }; }; @@ -3163,14 +3163,14 @@ port@0 { reg = <0>; atcphy1_ss: endpoint { - remote-endpoint = <&typec1_con_ss>; + remote-endpoint = <&typec1_connector_ss>; }; }; port@1 { reg = <1>; atcphy1_usb3: endpoint { - remote-endpoint = <&usb_drd1_ss>; + remote-endpoint = <&dwc3_1_ss>; }; }; }; @@ -3180,15 +3180,15 @@ status = "okay"; }; -&usb_drd1_dart_0 { +&dwc3_1_dart_0 { status = "okay"; }; -&usb_drd1_dart_1 { +&dwc3_1_dart_1 { status = "okay"; }; -&usb_drd1 { +&dwc3_1 { status = "okay"; ports { @@ -3197,14 +3197,14 @@ port@0 { reg = <0>; - usb_drd1_hs: endpoint { - remote-endpoint = <&typec1_con_hs>; + dwc3_1_hs: endpoint { + remote-endpoint = <&typec1_connector_hs>; }; }; port@1 { reg = <1>; - usb_drd1_ss: endpoint { + dwc3_1_ss: endpoint { remote-endpoint = <&atcphy1_usb3>; }; }; @@ -3221,14 +3221,14 @@ port@0 { reg = <0>; atcphy2_ss: endpoint { - remote-endpoint = <&typec2_con_ss>; + remote-endpoint = <&typec2_connector_ss>; }; }; port@1 { reg = <1>; atcphy2_usb3: endpoint { - remote-endpoint = <&usb_drd2_ss>; + remote-endpoint = <&dwc3_2_ss>; }; }; }; @@ -3238,15 +3238,15 @@ status = "okay"; }; -&usb_drd2_dart_0 { +&dwc3_2_dart_0 { status = "okay"; }; -&usb_drd2_dart_1 { +&dwc3_2_dart_1 { status = "okay"; }; -&usb_drd2 { +&dwc3_2 { status = "okay"; ports { @@ -3255,14 +3255,14 @@ port@0 { reg = <0>; - usb_drd2_hs: endpoint { - remote-endpoint = <&typec2_con_hs>; + dwc3_2_hs: endpoint { + remote-endpoint = <&typec2_connector_hs>; }; }; port@1 { reg = <1>; - usb_drd2_ss: endpoint { + dwc3_2_ss: endpoint { remote-endpoint = <&atcphy2_usb3>; }; }; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index bbd8f75eed752..a7c076c750c0a 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -1547,7 +1547,7 @@ status = "disabled"; }; - usb_drd0_dart_0: iommu@382f00000 { + dwc3_0_dart_0: iommu@382f00000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x82f00000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -1557,7 +1557,7 @@ status = "disabled"; }; - usb_drd0_dart_1: iommu@382f80000 { + dwc3_0_dart_1: iommu@382f80000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x82f80000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -1567,7 +1567,7 @@ status = "disabled"; }; - usb_drd0: usb@382280000 { + dwc3_0: usb@382280000 { compatible = "apple,t6040-dwc3", "apple,t8103-dwc3"; reg = <0x3 0x82280000 0x0 0xcd00>, <0x3 0x8228cd00 0x0 0x3200>, @@ -1583,7 +1583,7 @@ dr_mode = "otg"; usb-role-switch; role-switch-default-mode = "host"; - iommus = <&usb_drd0_dart_0 0>, <&usb_drd0_dart_1 1>; + iommus = <&dwc3_0_dart_0 0>, <&dwc3_0_dart_1 1>; power-domains = <&ps_atc0_usb>; resets = <&atcphy0>; phys = <&atcphy0 PHY_TYPE_USB2>, <&atcphy0 PHY_TYPE_USB3>; @@ -1631,7 +1631,7 @@ status = "disabled"; }; - usb_drd1_dart_0: iommu@38af00000 { + dwc3_1_dart_0: iommu@38af00000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x8af00000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -1641,7 +1641,7 @@ status = "disabled"; }; - usb_drd1_dart_1: iommu@38af80000 { + dwc3_1_dart_1: iommu@38af80000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x8af80000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -1651,7 +1651,7 @@ status = "disabled"; }; - usb_drd1: usb@38a280000 { + dwc3_1: usb@38a280000 { compatible = "apple,t6040-dwc3", "apple,t8103-dwc3"; reg = <0x3 0x8a280000 0x0 0xcd00>, <0x3 0x8a28cd00 0x0 0x3200>, @@ -1667,7 +1667,7 @@ dr_mode = "otg"; usb-role-switch; role-switch-default-mode = "host"; - iommus = <&usb_drd1_dart_0 0>, <&usb_drd1_dart_1 1>; + iommus = <&dwc3_1_dart_0 0>, <&dwc3_1_dart_1 1>; power-domains = <&ps_atc1_usb>; resets = <&atcphy1>; phys = <&atcphy1 PHY_TYPE_USB2>, <&atcphy1 PHY_TYPE_USB3>; @@ -1715,7 +1715,7 @@ status = "disabled"; }; - usb_drd2_dart_0: iommu@392f00000 { + dwc3_2_dart_0: iommu@392f00000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x92f00000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -1725,7 +1725,7 @@ status = "disabled"; }; - usb_drd2_dart_1: iommu@392f80000 { + dwc3_2_dart_1: iommu@392f80000 { compatible = "apple,t6041-dart", "apple,t8110-dart"; reg = <0x3 0x92f80000 0x0 0xc000>; interrupt-parent = <&aic>; @@ -1735,7 +1735,7 @@ status = "disabled"; }; - usb_drd2: usb@392280000 { + dwc3_2: usb@392280000 { compatible = "apple,t6040-dwc3", "apple,t8103-dwc3"; reg = <0x3 0x92280000 0x0 0xcd00>, <0x3 0x9228cd00 0x0 0x3200>, @@ -1751,7 +1751,7 @@ dr_mode = "otg"; usb-role-switch; role-switch-default-mode = "host"; - iommus = <&usb_drd2_dart_0 0>, <&usb_drd2_dart_1 1>; + iommus = <&dwc3_2_dart_0 0>, <&dwc3_2_dart_1 1>; power-domains = <&ps_atc2_usb>; resets = <&atcphy2>; phys = <&atcphy2 PHY_TYPE_USB2>, <&atcphy2 PHY_TYPE_USB3>; diff --git a/arch/arm64/boot/dts/apple/t8132-j713-usb4.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-usb4.dtsi index a833a86b9c30b..006fabc234ae4 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-usb4.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-usb4.dtsi @@ -72,7 +72,7 @@ port@1 { reg = <1>; usb4_0_acio_tbt: endpoint { - remote-endpoint = <&typec0_con_tbt>; + remote-endpoint = <&typec0_connector_tbt>; }; }; }; @@ -89,7 +89,7 @@ port@1 { reg = <1>; usb4_1_acio_tbt: endpoint { - remote-endpoint = <&typec1_con_tbt>; + remote-endpoint = <&typec1_connector_tbt>; }; }; }; @@ -99,7 +99,7 @@ ports { port@2 { reg = <2>; - typec0_con_tbt: endpoint { + typec0_connector_tbt: endpoint { remote-endpoint = <&usb4_0_acio_tbt>; }; }; @@ -110,7 +110,7 @@ ports { port@2 { reg = <2>; - typec1_con_tbt: endpoint { + typec1_connector_tbt: endpoint { remote-endpoint = <&usb4_1_acio_tbt>; }; }; From 1f1f0e6d9f2f3fb91be89f39ffa644f3885e60f9 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:42:52 -0500 Subject: [PATCH 13/17] arm64: dts: apple: t604x, t8132: put status last Move status after the other properties of each node, before its child nodes, as the DTS coding style asks; 57 nodes had it elsewhere. A one-line comment about the status moves with it. No output change: the dtbs are identical under dtc -I dtb -O dts -s. Signed-off-by: Diljit Singh --- .../boot/dts/apple/t6040-j773s-usb-front.dtsi | 4 +- arch/arm64/boot/dts/apple/t6040-j773s.dts | 12 +++--- .../boot/dts/apple/t6041-j614c-j616c.dtsi | 2 +- arch/arm64/boot/dts/apple/t604x-extdisp.dtsi | 10 ++--- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 14 +++---- arch/arm64/boot/dts/apple/t8132-j604.dts | 2 +- arch/arm64/boot/dts/apple/t8132-j624.dts | 4 +- .../arm64/boot/dts/apple/t8132-j713-pmgr.dtsi | 28 ++++++------- arch/arm64/boot/dts/apple/t8132-j773g.dts | 4 +- arch/arm64/boot/dts/apple/t8132.dtsi | 40 +++++++++---------- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi b/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi index 14287eb390611..d4c2664675fa8 100644 --- a/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi @@ -33,7 +33,6 @@ mboxes = <&atcphy3_mbox>; mbox-names = "phy-cpu"; nonposted-mmio; - status = "disabled"; apple,tunable-axi2af = <0x0 0x800000ff 0x80000025>, @@ -212,6 +211,7 @@ <0x44 0x00000004 0x00000004>; apple,tunable-usb2-host = <0x8 0x00007003 0x00000003>; + status = "disabled"; }; atcphy3_mbox: mailbox@39b148000 { @@ -265,7 +265,6 @@ resets = <&atcphy3>; phys = <&atcphy3 PHY_TYPE_USB2>, <&atcphy3 PHY_TYPE_USB3>; phy-names = "usb2-phy", "usb3-phy"; - status = "disabled"; apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, @@ -289,5 +288,6 @@ apple,tunable-gbl-default = <0x64 0x00000002 0x00000000>, <0x10 0xfff80000 0x00680000>; + status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/apple/t6040-j773s.dts b/arch/arm64/boot/dts/apple/t6040-j773s.dts index 15771fb425ab1..453cb8136f950 100644 --- a/arch/arm64/boot/dts/apple/t6040-j773s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j773s.dts @@ -58,38 +58,38 @@ gpu_fw_text: gpu-fw-text { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; gpu_fw_data: gpu-fw-data { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_ttbs: uat-ttbs { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_pagetables: uat-pagetables { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_l2_pagetables: uat-l2-pagetables { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_handoff: uat-handoff { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; }; }; diff --git a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi index d703e206e0a2b..c8b3ac44be7c0 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi +++ b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi @@ -893,12 +893,12 @@ }; &mesa { - status = "okay"; enable-gpios = <&pinctrl_nub 53 GPIO_ACTIVE_HIGH>; interrupt-parent = <&pinctrl>; interrupts = <116 IRQ_TYPE_EDGE_RISING>; spi-cs-setup-delay-ns = <20>; spi-cs-hold-delay-ns = <20>; + status = "okay"; }; &aop { diff --git a/arch/arm64/boot/dts/apple/t604x-extdisp.dtsi b/arch/arm64/boot/dts/apple/t604x-extdisp.dtsi index dcbce6e842cd9..3b60ac6afcb78 100644 --- a/arch/arm64/boot/dts/apple/t604x-extdisp.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-extdisp.dtsi @@ -100,7 +100,6 @@ mboxes = <&atcphy3_mbox>; mbox-names = "phy-cpu"; nonposted-mmio; - status = "disabled"; apple,tunable-axi2af = <0x0 0x800000ff 0x80000025>, <0x4 0x80ff00ff 0x80250003>, @@ -260,6 +259,7 @@ <0x1d098 0x00080000 0x00080000>, <0x1d0a4 0x00800000 0x00800000>, <0x1d0a8 0x00200000 0x00200000>; + status = "disabled"; }; atcphy3_mbox: mailbox@39b148000 { @@ -282,32 +282,32 @@ compatible = "apple,t6041-display-crossbar"; reg = <0x3 0x8324c000 0x0 0x4000>; #mux-control-cells = <1>; - status = "disabled"; power-domains = <&ps_atc0_usb>; + status = "disabled"; }; atcphy1_xbar: mux@38b24c000 { compatible = "apple,t6041-display-crossbar"; reg = <0x3 0x8b24c000 0x0 0x4000>; #mux-control-cells = <1>; - status = "disabled"; power-domains = <&ps_atc1_usb>; + status = "disabled"; }; atcphy2_xbar: mux@39324c000 { compatible = "apple,t6041-display-crossbar"; reg = <0x3 0x9324c000 0x0 0x4000>; #mux-control-cells = <1>; - status = "disabled"; power-domains = <&ps_atc2_usb>; + status = "disabled"; }; atcphy3_xbar: mux@39b24c000 { compatible = "apple,t6041-display-crossbar"; reg = <0x3 0x9b24c000 0x0 0x4000>; #mux-control-cells = <1>; - status = "disabled"; power-domains = <&ps_atc3_usb>; + status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index 0b3d6b030ee90..3c8e2354a3a58 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -109,8 +109,8 @@ */ gpu_fw_text: gpu-fw-text { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; /* @@ -119,8 +119,8 @@ */ gpu_fw_data: gpu-fw-data { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; /* @@ -130,26 +130,26 @@ */ uat_ttbs: uat-ttbs { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_pagetables: uat-pagetables { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_l2_pagetables: uat-l2-pagetables { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; uat_handoff: uat-handoff { reg = <0 0 0 0>; - status = "disabled"; no-map; + status = "disabled"; }; }; @@ -334,12 +334,12 @@ }; &mesa { - status = "okay"; enable-gpios = <&pinctrl_nub 53 GPIO_ACTIVE_HIGH>; interrupt-parent = <&pinctrl>; interrupts = <116 IRQ_TYPE_EDGE_RISING>; spi-cs-setup-delay-ns = <20>; spi-cs-hold-delay-ns = <20>; + status = "okay"; /* The board file names the per-device factory data. */ }; diff --git a/arch/arm64/boot/dts/apple/t8132-j604.dts b/arch/arm64/boot/dts/apple/t8132-j604.dts index 38cedf9d54c83..5830d21bee81b 100644 --- a/arch/arm64/boot/dts/apple/t8132-j604.dts +++ b/arch/arm64/boot/dts/apple/t8132-j604.dts @@ -253,11 +253,11 @@ }; &dwc3_3 { - status = "okay"; dr_mode = "host"; maximum-speed = "super-speed"; phys = <&atcphy3 PHY_TYPE_USB2>, <&atcphy3 PHY_TYPE_USB3>; phy-names = "usb2-phy", "usb3-phy"; + status = "okay"; ports { #address-cells = <1>; diff --git a/arch/arm64/boot/dts/apple/t8132-j624.dts b/arch/arm64/boot/dts/apple/t8132-j624.dts index 4df3488d2a77a..833f7a2788fe3 100644 --- a/arch/arm64/boot/dts/apple/t8132-j624.dts +++ b/arch/arm64/boot/dts/apple/t8132-j624.dts @@ -135,11 +135,11 @@ }; &dwc3_2 { - status = "okay"; dr_mode = "host"; maximum-speed = "super-speed"; phys = <&atcphy2 PHY_TYPE_USB2>, <&atcphy2 PHY_TYPE_USB3>; phy-names = "usb2-phy", "usb3-phy"; + status = "okay"; ports { #address-cells = <1>; @@ -179,11 +179,11 @@ }; &dwc3_3 { - status = "okay"; dr_mode = "host"; maximum-speed = "super-speed"; phys = <&atcphy3 PHY_TYPE_USB2>, <&atcphy3 PHY_TYPE_USB3>; phy-names = "usb2-phy", "usb3-phy"; + status = "okay"; ports { #address-cells = <1>; diff --git a/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi index 66b69f0f6320c..1e714aab47118 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi @@ -14,8 +14,8 @@ }; &ps_aic { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_dwi { @@ -23,8 +23,8 @@ }; &ps_gpio { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_pmc { @@ -80,18 +80,18 @@ }; &ps_dispext0_sys { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_dispext0_fe { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_dispext0_cpu { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_scodec { @@ -103,13 +103,13 @@ }; &ps_disp_sys { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_disp_fe { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_gfx { @@ -379,18 +379,18 @@ }; &ps_dispext1_sys { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_dispext1_fe { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_dispext1_cpu { - status = "okay"; apple,firmware-owned; + status = "okay"; }; /* The camera powers the ISP from its first stream until it is unbound. */ @@ -527,8 +527,8 @@ }; &ps_disp_cpu { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_debug_gated { @@ -560,8 +560,8 @@ }; &ps_nub_gpio { - status = "okay"; apple,firmware-owned; + status = "okay"; }; &ps_nub_sram { @@ -573,13 +573,13 @@ }; &ps_atc0_usb_aon { - status = "okay"; apple,inherited-on; + status = "okay"; }; &ps_atc1_usb_aon { - status = "okay"; apple,inherited-on; + status = "okay"; }; &ps_atc0_usb { diff --git a/arch/arm64/boot/dts/apple/t8132-j773g.dts b/arch/arm64/boot/dts/apple/t8132-j773g.dts index 1310ddfc6f88e..c7ae238c04f86 100644 --- a/arch/arm64/boot/dts/apple/t8132-j773g.dts +++ b/arch/arm64/boot/dts/apple/t8132-j773g.dts @@ -146,11 +146,11 @@ }; &dwc3_3 { - status = "okay"; dr_mode = "host"; maximum-speed = "super-speed"; phys = <&atcphy3 PHY_TYPE_USB2>, <&atcphy3 PHY_TYPE_USB3>; phy-names = "usb2-phy", "usb3-phy"; + status = "okay"; ports { #address-cells = <1>; @@ -183,8 +183,8 @@ }; &dwc3_2 { - status = "okay"; dr_mode = "host"; + status = "okay"; }; &wifi0 { diff --git a/arch/arm64/boot/dts/apple/t8132.dtsi b/arch/arm64/boot/dts/apple/t8132.dtsi index 278d539d9e841..aa5ff8589e5fa 100644 --- a/arch/arm64/boot/dts/apple/t8132.dtsi +++ b/arch/arm64/boot/dts/apple/t8132.dtsi @@ -429,8 +429,6 @@ * the same SoC description work across T8132 machines. */ ans_mbox: mbox@0 { - /* Enabled by the loader after all ADT resources are populated. */ - status = "disabled"; compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; reg = <0x0 0x0 0x0 0x4000>; interrupt-parent = <&aic>; @@ -442,19 +440,19 @@ "recv-empty", "recv-not-empty"; #mbox-cells = <0>; power-domains = <&ps_ans>; + /* Enabled by the loader after all ADT resources are populated. */ + status = "disabled"; }; sart: iommu@10000 { - /* Enabled by the loader after all ADT resources are populated. */ - status = "disabled"; compatible = "apple,t8132-sart", "apple,t6000-sart"; reg = <0x0 0x10000 0x0 0x10000>; power-domains = <&ps_ans>; + /* Enabled by the loader after all ADT resources are populated. */ + status = "disabled"; }; nvme: nvme@40000 { - /* Enabled by the loader after all ADT resources are populated. */ - status = "disabled"; compatible = "apple,t8132-nvme-ans2", "apple,t8103-nvme-ans2"; reg = <0x0 0x40000 0x0 0x40000>, @@ -468,6 +466,8 @@ power-domains = <&ps_ans>, <&ps_apcie_sys_st>; power-domain-names = "ans", "apcie0"; resets = <&ps_ans>; + /* Enabled by the loader after all ADT resources are populated. */ + status = "disabled"; }; pmgr: power-management@380700000 { @@ -1003,7 +1003,6 @@ }; nub_spmi_a0: spmi@388908000 { - status = "disabled"; compatible = "apple,t8132-spmi", "apple,t8103-spmi"; reg = <0x3 0x88908000 0x0 0x4000>; #address-cells = <2>; @@ -1012,6 +1011,7 @@ interrupt-controller; interrupt-parent = <&aic>; interrupts = ; + status = "disabled"; @@ -1019,20 +1019,20 @@ }; pmp_dart: iommu@380300000 { - status = "disabled"; compatible = "apple,t8132-dart", "apple,t8110-dart"; reg = <0x3 0x80300000 0x0 0xc000>; #iommu-cells = <1>; interrupt-parent = <&aic>; interrupts = ; power-domains = <&ps_pmp>; + status = "disabled"; }; pmp_report: pmp-report@3803c0000 { - status = "disabled"; compatible = "apple,t8132-pmp-v2-report"; reg = <0x3 0x803c0000 0x0 0x20000>; power-domains = <&ps_pms_sram>; + status = "disabled"; }; pmp: pmp@380500000 { @@ -1049,7 +1049,6 @@ }; pmp_mbox: mailbox@380e08000 { - status = "disabled"; compatible = "apple,t8132-asc-mailbox", "apple,asc-mailbox-v4"; reg = <0x3 0x80e08000 0x0 0x4000>; interrupt-parent = <&aic>; @@ -1061,10 +1060,10 @@ "recv-empty", "recv-not-empty"; #mbox-cells = <0>; power-domains = <&ps_pmp>, <&ps_pms_sram>; + status = "disabled"; }; atcphy0: phy@402a90000 { - status = "disabled"; compatible = "apple,t8132-atcphy"; reg = <0x4 0x02a90000 0x0 0x4000>, <0x4 0x02a84000 0x0 0x4000>; @@ -1075,6 +1074,7 @@ power-domains = <&ps_atc0_usb>; orientation-switch; mode-switch; + status = "disabled"; }; @@ -1092,27 +1092,26 @@ }; dwc3_0_dart_0: iommu@402f00000 { - status = "disabled"; compatible = "apple,t8132-dart", "apple,t8110-dart"; reg = <0x4 0x02f00000 0x0 0xc000>; interrupt-parent = <&aic>; interrupts = ; #iommu-cells = <1>; power-domains = <&ps_atc0_usb>; + status = "disabled"; }; dwc3_0_dart_1: iommu@402f80000 { - status = "disabled"; compatible = "apple,t8132-dart", "apple,t8110-dart"; reg = <0x4 0x02f80000 0x0 0xc000>; interrupt-parent = <&aic>; interrupts = ; #iommu-cells = <1>; power-domains = <&ps_atc0_usb>; + status = "disabled"; }; dwc3_0: usb@402280000 { - status = "disabled"; compatible = "apple,t8132-dwc3"; reg = <0x4 0x02280000 0x0 0xcd00>, <0x4 0x0228cd00 0x0 0x3200>; @@ -1130,12 +1129,12 @@ resets = <&atcphy0>; phys = <&atcphy0 PHY_TYPE_USB2>; phy-names = "usb2-phy"; + status = "disabled"; }; atcphy1: phy@40aa90000 { - status = "disabled"; compatible = "apple,t8132-atcphy"; reg = <0x4 0x0aa90000 0x0 0x4000>, <0x4 0x0aa84000 0x0 0x4000>; @@ -1146,6 +1145,7 @@ power-domains = <&ps_atc1_usb>; orientation-switch; mode-switch; + status = "disabled"; }; @@ -1163,27 +1163,26 @@ }; dwc3_1_dart_0: iommu@40af00000 { - status = "disabled"; compatible = "apple,t8132-dart", "apple,t8110-dart"; reg = <0x4 0x0af00000 0x0 0xc000>; interrupt-parent = <&aic>; interrupts = ; #iommu-cells = <1>; power-domains = <&ps_atc1_usb>; + status = "disabled"; }; dwc3_1_dart_1: iommu@40af80000 { - status = "disabled"; compatible = "apple,t8132-dart", "apple,t8110-dart"; reg = <0x4 0x0af80000 0x0 0xc000>; interrupt-parent = <&aic>; interrupts = ; #iommu-cells = <1>; power-domains = <&ps_atc1_usb>; + status = "disabled"; }; dwc3_1: usb@40a280000 { - status = "disabled"; compatible = "apple,t8132-dwc3"; reg = <0x4 0x0a280000 0x0 0xcd00>, <0x4 0x0a28cd00 0x0 0x3200>; @@ -1201,6 +1200,7 @@ resets = <&atcphy1>; phys = <&atcphy1 PHY_TYPE_USB2>; phy-names = "usb2-phy"; + status = "disabled"; }; @@ -1267,17 +1267,16 @@ }; dart_apcie0: iommu@490000000 { - status = "disabled"; compatible = "apple,t8132-dart", "apple,t8110-dart"; reg = <0x4 0x90000000 0x0 0x20000>; /* J713 ADT /arm-io/dart-apcie0, interrupt-parent AIC. */ interrupt-parent = <&aic>; interrupts = ; #iommu-cells = <1>; + status = "disabled"; }; pcie0: pcie@1cb0000000 { - status = "disabled"; compatible = "apple,t8132-pcie"; device_type = "pci"; @@ -1304,6 +1303,7 @@ 0xb 0xc0000000 0x0 0x20000000>, <0x02000000 0x0 0x80000000 0xb 0x80000000 0x0 0x40000000>; + status = "disabled"; port00: pci@0,0 { device_type = "pci"; From 875e4815f0ab3ab7666cc306642a3c5b1b2c1971 Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:45:33 -0500 Subject: [PATCH 14/17] arm64: dts: apple: t604x: expand one-line nodes and raw specifiers The J614c/J616c, J575c, J614s and J773s sources still have parts that read like a decompiled tree: - 65 one-line nodes ('temperature-Tpx0 { apple,key-id = ...; };', '&i2c1 { nonposted-mmio; };'), now one statement per line; - repeated &aop, &admac0, &admac1, &aop_dart and &i2c1-3 blocks in the J614c/J616c body, now folded into the first block for each; - raw cells in the four copies of the PCIe controller node: interrupts <0 0x6bb 4> is , the GPIO flags are GPIO_ACTIVE_HIGH/LOW, and ranges and interrupt-map are split per entry, with #address-cells before #size-cells. No output change: the dtbs are identical under dtc -I dtb -O dts -s. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t6040-j614s.dts | 14 +- arch/arm64/boot/dts/apple/t6040-j773s.dts | 12 +- arch/arm64/boot/dts/apple/t6041-j575c.dts | 189 +++++++++++--- .../boot/dts/apple/t6041-j614c-j616c.dtsi | 239 ++++++++++++++---- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 18 +- 5 files changed, 379 insertions(+), 93 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j614s.dts b/arch/arm64/boot/dts/apple/t6040-j614s.dts index dc12f1d2c5615..60276d562203f 100644 --- a/arch/arm64/boot/dts/apple/t6040-j614s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j614s.dts @@ -111,6 +111,14 @@ }; }; -&isp_dart0 { status = "disabled"; }; -&isp_dart1 { status = "disabled"; }; -&isp_dart2 { status = "disabled"; }; +&isp_dart0 { + status = "disabled"; +}; + +&isp_dart1 { + status = "disabled"; +}; + +&isp_dart2 { + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/apple/t6040-j773s.dts b/arch/arm64/boot/dts/apple/t6040-j773s.dts index 453cb8136f950..003cbefd8ba55 100644 --- a/arch/arm64/boot/dts/apple/t6040-j773s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j773s.dts @@ -287,11 +287,12 @@ reg-names = "config", "rc", "port0", "port1", "port2", "port3", "phy0", "phy1", "phy2", "phy3"; - ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; + ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0x0 0x20000000>, + <0x02000000 0x0 0x80000000 0xb 0x80000000 0x0 0x40000000>; pinctrl-names = "default"; pinctrl-0 = <&wifi_clkreq_pins ð_clkreq_pins>; - #size-cells = <2>; #address-cells = <3>; + #size-cells = <2>; bus-range = <0 2>; iommu-map-mask = <0xffff>; iommu-map = <0x100 &pcie_dart 1 2>, <0x200 &apcie2_dart 1 1>; @@ -308,12 +309,15 @@ port00: pci@0,0 { reg = <0 0 0 0 0>; ranges; - interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; + interrupt-map = <0 0 0 1 &port00 0 0 0 0>, + <0 0 0 2 &port00 0 0 0 1>, + <0 0 0 3 &port00 0 0 0 2>, + <0 0 0 4 &port00 0 0 0 3>; interrupt-map-mask = <0 0 0 7>; #interrupt-cells = <1>; interrupt-controller; - #size-cells = <2>; #address-cells = <3>; + #size-cells = <2>; /* ADT /amfm reg_on gP13 */ pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; reset-gpios = <&pinctrl 4 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/apple/t6041-j575c.dts b/arch/arm64/boot/dts/apple/t6041-j575c.dts index 85acbc4f0ae8f..6171cabaf26ea 100644 --- a/arch/arm64/boot/dts/apple/t6041-j575c.dts +++ b/arch/arm64/boot/dts/apple/t6041-j575c.dts @@ -147,24 +147,96 @@ apple,key-id = "TCMz"; label = "CPU Die Max"; }; - temperature-TCMb { apple,key-id = "TCMb"; label = "CPU TCMb"; }; - temperature-Tpx0 { apple,key-id = "Tpx0"; label = "CPU Tpx0"; }; - temperature-Tpx1 { apple,key-id = "Tpx1"; label = "CPU Tpx1"; }; - temperature-Tpx2 { apple,key-id = "Tpx2"; label = "CPU Tpx2"; }; - temperature-Tpx3 { apple,key-id = "Tpx3"; label = "CPU Tpx3"; }; - temperature-Tpx4 { apple,key-id = "Tpx4"; label = "CPU Tpx4"; }; - temperature-Tpx5 { apple,key-id = "Tpx5"; label = "CPU Tpx5"; }; - temperature-Tpx8 { apple,key-id = "Tpx8"; label = "CPU Tpx8"; }; - temperature-Tpx9 { apple,key-id = "Tpx9"; label = "CPU Tpx9"; }; - temperature-TpxA { apple,key-id = "TpxA"; label = "CPU TpxA"; }; - temperature-TpxB { apple,key-id = "TpxB"; label = "CPU TpxB"; }; - temperature-TpxC { apple,key-id = "TpxC"; label = "CPU TpxC"; }; - temperature-TpxD { apple,key-id = "TpxD"; label = "CPU TpxD"; }; - temperature-Tex0 { apple,key-id = "Tex0"; label = "CPU Tex0"; }; - temperature-Tex1 { apple,key-id = "Tex1"; label = "CPU Tex1"; }; - temperature-Tex2 { apple,key-id = "Tex2"; label = "CPU Tex2"; }; - temperature-Tex3 { apple,key-id = "Tex3"; label = "CPU Tex3"; }; - temperature-TW0P { apple,key-id = "TW0P"; label = "WiFi/BT Module Temp"; }; + + temperature-TCMb { + apple,key-id = "TCMb"; + label = "CPU TCMb"; + }; + + temperature-Tpx0 { + apple,key-id = "Tpx0"; + label = "CPU Tpx0"; + }; + + temperature-Tpx1 { + apple,key-id = "Tpx1"; + label = "CPU Tpx1"; + }; + + temperature-Tpx2 { + apple,key-id = "Tpx2"; + label = "CPU Tpx2"; + }; + + temperature-Tpx3 { + apple,key-id = "Tpx3"; + label = "CPU Tpx3"; + }; + + temperature-Tpx4 { + apple,key-id = "Tpx4"; + label = "CPU Tpx4"; + }; + + temperature-Tpx5 { + apple,key-id = "Tpx5"; + label = "CPU Tpx5"; + }; + + temperature-Tpx8 { + apple,key-id = "Tpx8"; + label = "CPU Tpx8"; + }; + + temperature-Tpx9 { + apple,key-id = "Tpx9"; + label = "CPU Tpx9"; + }; + + temperature-TpxA { + apple,key-id = "TpxA"; + label = "CPU TpxA"; + }; + + temperature-TpxB { + apple,key-id = "TpxB"; + label = "CPU TpxB"; + }; + + temperature-TpxC { + apple,key-id = "TpxC"; + label = "CPU TpxC"; + }; + + temperature-TpxD { + apple,key-id = "TpxD"; + label = "CPU TpxD"; + }; + + temperature-Tex0 { + apple,key-id = "Tex0"; + label = "CPU Tex0"; + }; + + temperature-Tex1 { + apple,key-id = "Tex1"; + label = "CPU Tex1"; + }; + + temperature-Tex2 { + apple,key-id = "Tex2"; + label = "CPU Tex2"; + }; + + temperature-Tex3 { + apple,key-id = "Tex3"; + label = "CPU Tex3"; + }; + + temperature-TW0P { + apple,key-id = "TW0P"; + label = "WiFi/BT Module Temp"; + }; }; #include "hwmon-common.dtsi" @@ -246,11 +318,12 @@ reg-names = "config", "rc", "port0", "port1", "port2", "port3", "phy0", "phy1", "phy2", "phy3"; - ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; + ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0x0 0x20000000>, + <0x02000000 0x0 0x80000000 0xb 0x80000000 0x0 0x40000000>; pinctrl-names = "default"; pinctrl-0 = <&wifi_clkreq_pins &sd_clkreq_pins ð_clkreq_pins &xhci_clkreq_pins>; - #size-cells = <2>; #address-cells = <3>; + #size-cells = <2>; bus-range = <0 4>; iommu-map-mask = <0xffff>; iommu-map = <0x100 &pcie_dart 1 2>, <0x200 &apcie1_dart 1 1>, @@ -269,12 +342,15 @@ port00: pci@0,0 { reg = <0 0 0 0 0>; ranges; - interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; + interrupt-map = <0 0 0 1 &port00 0 0 0 0>, + <0 0 0 2 &port00 0 0 0 1>, + <0 0 0 3 &port00 0 0 0 2>, + <0 0 0 4 &port00 0 0 0 3>; interrupt-map-mask = <0 0 0 7>; #interrupt-cells = <1>; interrupt-controller; - #size-cells = <2>; #address-cells = <3>; + #size-cells = <2>; pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; reset-gpios = <&pinctrl 4 GPIO_ACTIVE_LOW>; device_type = "pci"; @@ -633,62 +709,77 @@ opp-hz = /bits/ 64 <0>; opp-microvolt = <125000 125000 125000 125000>; }; + opp01 { opp-hz = /bits/ 64 <338000000>; opp-microvolt = <600000 600000 600000 600000>; }; + opp02 { opp-hz = /bits/ 64 <618000000>; opp-microvolt = <665000 665000 660000 660000>; }; + opp03 { opp-hz = /bits/ 64 <796000000>; opp-microvolt = <705000 705000 700000 705000>; }; + opp04 { opp-hz = /bits/ 64 <924000000>; opp-microvolt = <725000 725000 715000 730000>; }; + opp05 { opp-hz = /bits/ 64 <952000000>; opp-microvolt = <770000 770000 770000 780000>; }; + opp06 { opp-hz = /bits/ 64 <1056000000>; opp-microvolt = <770000 770000 770000 780000>; }; + opp07 { opp-hz = /bits/ 64 <1062000000>; opp-microvolt = <810000 810000 805000 810000>; }; + opp08 { opp-hz = /bits/ 64 <1182000000>; opp-microvolt = <810000 810000 805000 810000>; }; + opp09 { opp-hz = /bits/ 64 <1182000000>; opp-microvolt = <860000 860000 860000 860000>; }; + opp10 { opp-hz = /bits/ 64 <1312000000>; opp-microvolt = <860000 860000 860000 860000>; }; + opp11 { opp-hz = /bits/ 64 <1242000000>; opp-microvolt = <900000 895000 900000 900000>; }; + opp12 { opp-hz = /bits/ 64 <1380000000>; opp-microvolt = <900000 895000 900000 900000>; }; + opp13 { opp-hz = /bits/ 64 <1326000000>; opp-microvolt = <940000 925000 940000 940000>; }; + opp14 { opp-hz = /bits/ 64 <1470000000>; opp-microvolt = <940000 925000 940000 940000>; }; + opp15 { opp-hz = /bits/ 64 <1578000000>; opp-microvolt = <1020000 1020000 1020000 1020000>; @@ -702,30 +793,37 @@ opp-hz = /bits/ 64 <24000000>; opp-microvolt = <585000>; }; + opp01 { opp-hz = /bits/ 64 <338000000>; opp-microvolt = <585000>; }; + opp02 { opp-hz = /bits/ 64 <618000000>; opp-microvolt = <635000>; }; + opp03 { opp-hz = /bits/ 64 <796000000>; opp-microvolt = <685000>; }; + opp04 { opp-hz = /bits/ 64 <992000000>; opp-microvolt = <720000>; }; + opp05 { opp-hz = /bits/ 64 <1188000000>; opp-microvolt = <770000>; }; + opp06 { opp-hz = /bits/ 64 <1380000000>; opp-microvolt = <855000>; }; + opp07 { opp-hz = /bits/ 64 <1470000000>; opp-microvolt = <885000>; @@ -739,30 +837,37 @@ opp-hz = /bits/ 64 <24000000>; opp-microvolt = <585000>; }; + opp01 { opp-hz = /bits/ 64 <338000000>; opp-microvolt = <585000>; }; + opp02 { opp-hz = /bits/ 64 <618000000>; opp-microvolt = <635000>; }; + opp03 { opp-hz = /bits/ 64 <796000000>; opp-microvolt = <685000>; }; + opp04 { opp-hz = /bits/ 64 <992000000>; opp-microvolt = <720000>; }; + opp05 { opp-hz = /bits/ 64 <1188000000>; opp-microvolt = <770000>; }; + opp06 { opp-hz = /bits/ 64 <1380000000>; opp-microvolt = <855000>; }; + opp07 { opp-hz = /bits/ 64 <1470000000>; opp-microvolt = <885000>; @@ -895,17 +1000,39 @@ }; }; -&aop { nonposted-mmio; }; +&aop { + nonposted-mmio; +}; /* No ambient light sensor and no lid. */ -&aop_als { status = "disabled"; }; -&aop_las { status = "disabled"; }; - -&admac1 { dma-channels = <26>; nonposted-mmio; }; -&admac0 { nonposted-mmio; }; -&aop_dart { nonposted-mmio; }; -&i2c1 { nonposted-mmio; }; -&i2c2 { nonposted-mmio; }; +&aop_als { + status = "disabled"; +}; + +&aop_las { + status = "disabled"; +}; + +&admac1 { + dma-channels = <26>; + nonposted-mmio; +}; + +&admac0 { + nonposted-mmio; +}; + +&aop_dart { + nonposted-mmio; +}; + +&i2c1 { + nonposted-mmio; +}; + +&i2c2 { + nonposted-mmio; +}; / { reserved-memory { diff --git a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi index c8b3ac44be7c0..5b023ba20dd1c 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi +++ b/arch/arm64/boot/dts/apple/t6041-j614c-j616c.dtsi @@ -173,33 +173,141 @@ apple,key-id = "TCMz"; label = "CPU Die Max"; }; - temperature-TCMb { apple,key-id = "TCMb"; label = "CPU TCMb"; }; - temperature-Tpx0 { apple,key-id = "Tpx0"; label = "CPU Tpx0"; }; - temperature-Tpx1 { apple,key-id = "Tpx1"; label = "CPU Tpx1"; }; - temperature-Tpx2 { apple,key-id = "Tpx2"; label = "CPU Tpx2"; }; - temperature-Tpx3 { apple,key-id = "Tpx3"; label = "CPU Tpx3"; }; - temperature-Tpx4 { apple,key-id = "Tpx4"; label = "CPU Tpx4"; }; - temperature-Tpx5 { apple,key-id = "Tpx5"; label = "CPU Tpx5"; }; - temperature-Tpx8 { apple,key-id = "Tpx8"; label = "CPU Tpx8"; }; - temperature-Tpx9 { apple,key-id = "Tpx9"; label = "CPU Tpx9"; }; - temperature-TpxA { apple,key-id = "TpxA"; label = "CPU TpxA"; }; - temperature-TpxB { apple,key-id = "TpxB"; label = "CPU TpxB"; }; - temperature-TpxC { apple,key-id = "TpxC"; label = "CPU TpxC"; }; - temperature-TpxD { apple,key-id = "TpxD"; label = "CPU TpxD"; }; - temperature-Tex0 { apple,key-id = "Tex0"; label = "CPU Tex0"; }; - temperature-Tex1 { apple,key-id = "Tex1"; label = "CPU Tex1"; }; - temperature-Tex2 { apple,key-id = "Tex2"; label = "CPU Tex2"; }; - temperature-Tex3 { apple,key-id = "Tex3"; label = "CPU Tex3"; }; - temperature-TH0x { apple,key-id = "TH0x"; label = "NAND Flash Temperature"; }; - temperature-TB0T { apple,key-id = "TB0T"; label = "Battery Hotspot"; }; - temperature-TCHP { apple,key-id = "TCHP"; label = "Charge Regulator Temp"; }; - temperature-TW0P { apple,key-id = "TW0P"; label = "WiFi/BT Module Temp"; }; - power-PSTR { apple,key-id = "PSTR"; label = "Total System Power"; }; - power-PHPC { apple,key-id = "PHPC"; label = "Heatpipe Power"; }; - power-PDTR { apple,key-id = "PDTR"; label = "AC Input Power"; }; - voltage-VD0R { apple,key-id = "VD0R"; label = "AC Input Voltage"; }; - voltage-SBAV { apple,key-id = "SBAV"; label = "Battery Voltage"; }; - current-ID0R { apple,key-id = "ID0R"; label = "AC Input Current"; }; + + temperature-TCMb { + apple,key-id = "TCMb"; + label = "CPU TCMb"; + }; + + temperature-Tpx0 { + apple,key-id = "Tpx0"; + label = "CPU Tpx0"; + }; + + temperature-Tpx1 { + apple,key-id = "Tpx1"; + label = "CPU Tpx1"; + }; + + temperature-Tpx2 { + apple,key-id = "Tpx2"; + label = "CPU Tpx2"; + }; + + temperature-Tpx3 { + apple,key-id = "Tpx3"; + label = "CPU Tpx3"; + }; + + temperature-Tpx4 { + apple,key-id = "Tpx4"; + label = "CPU Tpx4"; + }; + + temperature-Tpx5 { + apple,key-id = "Tpx5"; + label = "CPU Tpx5"; + }; + + temperature-Tpx8 { + apple,key-id = "Tpx8"; + label = "CPU Tpx8"; + }; + + temperature-Tpx9 { + apple,key-id = "Tpx9"; + label = "CPU Tpx9"; + }; + + temperature-TpxA { + apple,key-id = "TpxA"; + label = "CPU TpxA"; + }; + + temperature-TpxB { + apple,key-id = "TpxB"; + label = "CPU TpxB"; + }; + + temperature-TpxC { + apple,key-id = "TpxC"; + label = "CPU TpxC"; + }; + + temperature-TpxD { + apple,key-id = "TpxD"; + label = "CPU TpxD"; + }; + + temperature-Tex0 { + apple,key-id = "Tex0"; + label = "CPU Tex0"; + }; + + temperature-Tex1 { + apple,key-id = "Tex1"; + label = "CPU Tex1"; + }; + + temperature-Tex2 { + apple,key-id = "Tex2"; + label = "CPU Tex2"; + }; + + temperature-Tex3 { + apple,key-id = "Tex3"; + label = "CPU Tex3"; + }; + + temperature-TH0x { + apple,key-id = "TH0x"; + label = "NAND Flash Temperature"; + }; + + temperature-TB0T { + apple,key-id = "TB0T"; + label = "Battery Hotspot"; + }; + + temperature-TCHP { + apple,key-id = "TCHP"; + label = "Charge Regulator Temp"; + }; + + temperature-TW0P { + apple,key-id = "TW0P"; + label = "WiFi/BT Module Temp"; + }; + + power-PSTR { + apple,key-id = "PSTR"; + label = "Total System Power"; + }; + + power-PHPC { + apple,key-id = "PHPC"; + label = "Heatpipe Power"; + }; + + power-PDTR { + apple,key-id = "PDTR"; + label = "AC Input Power"; + }; + + voltage-VD0R { + apple,key-id = "VD0R"; + label = "AC Input Voltage"; + }; + + voltage-SBAV { + apple,key-id = "SBAV"; + label = "Battery Voltage"; + }; + + current-ID0R { + apple,key-id = "ID0R"; + label = "AC Input Current"; + }; }; &pinctrl { @@ -280,32 +388,36 @@ reg-names = "config", "rc", "port0", "port1", "port2", "port3", "phy0", "phy1", "phy2", "phy3"; - ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; + ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0x0 0x20000000>, + <0x02000000 0x0 0x80000000 0xb 0x80000000 0x0 0x40000000>; pinctrl-names = "default"; pinctrl-0 = <&wifi_clkreq_pins>; - #size-cells = <2>; #address-cells = <3>; + #size-cells = <2>; bus-range = <0 1>; iommu-map-mask = <0xffff>; iommu-map = <0x100 &pcie_dart 1 2>; msi-ranges = <&aic AIC_IRQ 2071 IRQ_TYPE_EDGE_RISING 32>; msi-parent = <&pcie0>; msi-controller; - interrupts = <0 0x6bb 4>; + interrupts = ; interrupt-parent = <&aic>; device_type = "pci"; port00: pci@0,0 { reg = <0 0 0 0 0>; ranges; - interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; + interrupt-map = <0 0 0 1 &port00 0 0 0 0>, + <0 0 0 2 &port00 0 0 0 1>, + <0 0 0 3 &port00 0 0 0 2>, + <0 0 0 4 &port00 0 0 0 3>; interrupt-map-mask = <0 0 0 7>; #interrupt-cells = <1>; interrupt-controller; - #size-cells = <2>; #address-cells = <3>; - pwren-gpios = <&smc_gpio 0x13 0>; - reset-gpios = <&pinctrl 4 1>; + #size-cells = <2>; + pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pinctrl 4 GPIO_ACTIVE_LOW>; device_type = "pci"; bluetooth0: bluetooth@0,1 { @@ -542,62 +654,77 @@ opp-hz = /bits/ 64 <0>; opp-microvolt = <125000 125000 125000 125000>; }; + opp01 { opp-hz = /bits/ 64 <338000000>; opp-microvolt = <600000 600000 600000 600000>; }; + opp02 { opp-hz = /bits/ 64 <618000000>; opp-microvolt = <665000 665000 660000 660000>; }; + opp03 { opp-hz = /bits/ 64 <796000000>; opp-microvolt = <705000 705000 700000 705000>; }; + opp04 { opp-hz = /bits/ 64 <924000000>; opp-microvolt = <725000 725000 715000 730000>; }; + opp05 { opp-hz = /bits/ 64 <952000000>; opp-microvolt = <770000 770000 770000 780000>; }; + opp06 { opp-hz = /bits/ 64 <1056000000>; opp-microvolt = <770000 770000 770000 780000>; }; + opp07 { opp-hz = /bits/ 64 <1062000000>; opp-microvolt = <810000 810000 805000 810000>; }; + opp08 { opp-hz = /bits/ 64 <1182000000>; opp-microvolt = <810000 810000 805000 810000>; }; + opp09 { opp-hz = /bits/ 64 <1182000000>; opp-microvolt = <860000 860000 860000 860000>; }; + opp10 { opp-hz = /bits/ 64 <1312000000>; opp-microvolt = <860000 860000 860000 860000>; }; + opp11 { opp-hz = /bits/ 64 <1242000000>; opp-microvolt = <900000 895000 900000 900000>; }; + opp12 { opp-hz = /bits/ 64 <1380000000>; opp-microvolt = <900000 895000 900000 900000>; }; + opp13 { opp-hz = /bits/ 64 <1326000000>; opp-microvolt = <940000 925000 940000 940000>; }; + opp14 { opp-hz = /bits/ 64 <1470000000>; opp-microvolt = <940000 925000 940000 940000>; }; + opp15 { opp-hz = /bits/ 64 <1578000000>; opp-microvolt = <1020000 1020000 1020000 1020000>; @@ -611,30 +738,37 @@ opp-hz = /bits/ 64 <24000000>; opp-microvolt = <585000>; }; + opp01 { opp-hz = /bits/ 64 <338000000>; opp-microvolt = <585000>; }; + opp02 { opp-hz = /bits/ 64 <618000000>; opp-microvolt = <635000>; }; + opp03 { opp-hz = /bits/ 64 <796000000>; opp-microvolt = <685000>; }; + opp04 { opp-hz = /bits/ 64 <992000000>; opp-microvolt = <720000>; }; + opp05 { opp-hz = /bits/ 64 <1188000000>; opp-microvolt = <770000>; }; + opp06 { opp-hz = /bits/ 64 <1380000000>; opp-microvolt = <855000>; }; + opp07 { opp-hz = /bits/ 64 <1470000000>; opp-microvolt = <885000>; @@ -648,30 +782,37 @@ opp-hz = /bits/ 64 <24000000>; opp-microvolt = <585000>; }; + opp01 { opp-hz = /bits/ 64 <338000000>; opp-microvolt = <585000>; }; + opp02 { opp-hz = /bits/ 64 <618000000>; opp-microvolt = <635000>; }; + opp03 { opp-hz = /bits/ 64 <796000000>; opp-microvolt = <685000>; }; + opp04 { opp-hz = /bits/ 64 <992000000>; opp-microvolt = <720000>; }; + opp05 { opp-hz = /bits/ 64 <1188000000>; opp-microvolt = <770000>; }; + opp06 { opp-hz = /bits/ 64 <1380000000>; opp-microvolt = <855000>; }; + opp07 { opp-hz = /bits/ 64 <1470000000>; opp-microvolt = <885000>; @@ -695,6 +836,7 @@ aliases { aop = &aop; }; + speaker_sdz: regulator-sn012776-sdz { compatible = "regulator-fixed"; regulator-name = "sn012776-sdz"; @@ -746,6 +888,8 @@ }; &aop { + nonposted-mmio; + memory-region = <&aop_mmio_pmgr>; status = "okay"; }; @@ -754,14 +898,18 @@ }; &aop_dart { + nonposted-mmio; status = "okay"; }; &admac0 { + nonposted-mmio; status = "okay"; }; &admac1 { + dma-channels = <26>; + nonposted-mmio; status = "okay"; }; @@ -770,6 +918,7 @@ }; &i2c1 { + nonposted-mmio; status = "okay"; speaker_left_woof1: codec@38 { @@ -810,6 +959,7 @@ }; &i2c3 { + nonposted-mmio; status = "okay"; speaker_right_woof1: codec@3b { @@ -850,6 +1000,7 @@ }; &i2c2 { + nonposted-mmio; status = "okay"; jack_codec: codec@4b { @@ -862,17 +1013,13 @@ }; }; -&aop { nonposted-mmio; }; - -&aop_als { status = "disabled"; }; -&aop_las { status = "disabled"; }; +&aop_als { + status = "disabled"; +}; -&admac1 { dma-channels = <26>; nonposted-mmio; }; -&admac0 { nonposted-mmio; }; -&aop_dart { nonposted-mmio; }; -&i2c1 { nonposted-mmio; }; -&i2c2 { nonposted-mmio; }; -&i2c3 { nonposted-mmio; }; +&aop_las { + status = "disabled"; +}; / { reserved-memory { @@ -901,10 +1048,6 @@ status = "okay"; }; -&aop { - memory-region = <&aop_mmio_pmgr>; -}; - #include "hwmon-fan-dual.dtsi" &smc_hwmon { diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index 3c8e2354a3a58..c82c82c8d6063 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -2666,32 +2666,36 @@ reg-names = "config", "rc", "port0", "port1", "port2", "port3", "phy0", "phy1", "phy2", "phy3"; - ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>; + ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0x0 0x20000000>, + <0x02000000 0x0 0x80000000 0xb 0x80000000 0x0 0x40000000>; pinctrl-names = "default"; pinctrl-0 = <&wifi_clkreq_pins>; - #size-cells = <2>; #address-cells = <3>; + #size-cells = <2>; bus-range = <0 1>; iommu-map-mask = <0xffff>; iommu-map = <0x100 &pcie_dart 1 2>; msi-ranges = <&aic AIC_IRQ 2071 IRQ_TYPE_EDGE_RISING 32>; msi-parent = <&pcie0>; msi-controller; - interrupts = <0 0x6bb 4>; + interrupts = ; interrupt-parent = <&aic>; device_type = "pci"; port00: pci@0,0 { reg = <0 0 0 0 0>; ranges; - interrupt-map = <0 0 0 1 &port00 0 0 0 0 0 0 0 2 &port00 0 0 0 1 0 0 0 3 &port00 0 0 0 2 0 0 0 4 &port00 0 0 0 3>; + interrupt-map = <0 0 0 1 &port00 0 0 0 0>, + <0 0 0 2 &port00 0 0 0 1>, + <0 0 0 3 &port00 0 0 0 2>, + <0 0 0 4 &port00 0 0 0 3>; interrupt-map-mask = <0 0 0 7>; #interrupt-cells = <1>; interrupt-controller; - #size-cells = <2>; #address-cells = <3>; - pwren-gpios = <&smc_gpio 0x13 0>; - reset-gpios = <&pinctrl 4 1>; + #size-cells = <2>; + pwren-gpios = <&smc_gpio 0x13 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pinctrl 4 GPIO_ACTIVE_LOW>; device_type = "pci"; bluetooth0: bluetooth@0,1 { From c23a8f01f1c445572912341ce8ae8c3fb4cae13c Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:46:34 -0500 Subject: [PATCH 15/17] arm64: dts: apple: t604x, t8132: shorten the longest comments Cut the 82-line thermal zone comment in t6040-gpu-thermal.dtsi to the facts the values depend on, and tighten the SMC key, OPP and PMC comments. Drop the issue reference from the DISPEXT0 PMP comment, and point the T8132 USB4 comment at t8132-pciec-tunables.dtsi, which now holds the PCIe-C calibration. No output change: the dtbs are byte-identical. Signed-off-by: Diljit Singh --- .../boot/dts/apple/t6040-gpu-thermal.dtsi | 95 ++++--------------- .../dts/apple/t6040-j616s-extdisp-hdmi.dtsi | 10 +- .../arm64/boot/dts/apple/t604x-j614-j616.dtsi | 17 ++-- arch/arm64/boot/dts/apple/t604x.dtsi | 42 ++++---- arch/arm64/boot/dts/apple/t8132-usb4.dtsi | 7 +- 5 files changed, 48 insertions(+), 123 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6040-gpu-thermal.dtsi b/arch/arm64/boot/dts/apple/t6040-gpu-thermal.dtsi index 1c580791838fc..74af4a032b1d8 100644 --- a/arch/arm64/boot/dts/apple/t6040-gpu-thermal.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-gpu-thermal.dtsi @@ -162,86 +162,25 @@ }; /* - * CPU die temperature: SMC key TCMz (CPU die max), sensor 0 of - * smc_hwmon, polled once a second as the SMC refreshes it. Per-cluster - * and GPU zones follow, one per SMC die-maximum sensor (smc_hwmon - * channels 1-23, in the order of the temperature nodes below): Tex0-3 - * throttle the E cluster, Tpx0-5 the first P cluster and Tpx8-D the - * second. The die zone throttles all three. The cpufreq cooling device - * sits on a cluster's policy CPU, so each map lists every CPU of its - * cluster. + * Zones on the SMC die-maximum sensors (smc_hwmon 0-23): TCMz for the + * die, Tex0-3, Tpx0-5 and Tpx8-D per CPU cluster, and the seven + * hottest GPU sensors. The PMP's loop holds the die at the ADT + * fast-die-ctrl-loop target of 110 C, as on macOS; these zones are + * the backstop behind it. * - * The fast control is the PMP's, as on macOS: its loop holds its own - * hot-spot sensors at the ADT fast-die-ctrl-loop target of 110 C and - * cpufreq enforces its effort as a frequency limit within milliseconds. - * Under a sustained all-core build TCMz then settles at 113 to 114 C. - * The CPU zones are the slower backstop above that point: the power - * allocator switches on at 75 C and controls at 115 C, so it leaves the - * PMP's operating point alone and only trims what the PMP lets through. + * - CPU zones run the power allocator from 75 C, control at 115 C and + * throttle only the cluster their sensor sits on. The 1 s samples + * jump by about 10 C, so the zones are integral-led. + * - GPU zones: the GPU firmware limits itself from 101 C; these shed + * CPU power from the same point (on at 90 C) and shut down at 118 C. + * A powered-off GPU reads -4 to 4 C. + * - Hot at 120 C only reports; critical is the ADT's 125 C sochot + * level, after three samples (critical-samples). + * - The fans stay with the SMC, as on macOS: no active trips. * - * The PMP's sensors do not see every hot spot. Under mixed SIMD, - * memory and GPU load the per-core Tpx sensors follow a core's power - * within a second and jump by 9-10 C (one standard deviation) between - * 1 s samples while the PMP's effort stays at zero. A controller on - * these samples cannot stop single excursions, and a proportional one - * swings between no limit and full cooling every second, so the zones - * are integral-led: the wide 40 C switch-on window keeps the - * proportional gains low and integral-time-constant-ms sets the - * integral term. Each zone throttles only the cluster its sensor sits - * on: the allocator divides a zone's budget by requested power, so a - * zone that throttled every cluster left a hot core's own cluster - * nearly at full speed. - * - * Critical (orderly shutdown) is at 125 C, the per-sensor maximum the - * ADT temp-sensor table gives next to the 110 C target for the PMP's - * sensors (the sochot level). The SMC sensors read a few degrees above - * the PMP's, so Linux shuts down at or before the hardware's own limit. - * A hot trip at 120 C only reports, and the critical trip acts only - * after three consecutive samples at or above it (critical-samples), - * so one excursion cannot shut the machine down. Under any load the - * per-core excursions have peaked at 116.5-118 C, which the former - * 118 C critical trip turned into a shutdown. - * - * The GPU has no cooling device of its own: its firmware sets the GPU - * performance state and starts limiting at 101 C. So when a GPU die - * sensor reaches the GPU firmware's limit, the seven - * hottest ones (Tg05, Tg0S, Tg0Y, Tg0k, Tg0z, Tg1V, Tg1l) also shed - * CPU power through the CPU clusters, from the same 101 C, leaving the - * shared heat budget to the GPU. They shut down at 118 C. While the - * GPU is powered off its sensors report placeholder values from -4 to - * 4 C. - * - * Every zone runs the power allocator, which acts at any temperature - * unless a zone has a second passive trip: the first one is then its - * switch-on point, below which it resets and grants full power. So each - * zone has one: 75 C under the 115 C die and CPU control trip and 90 C - * under the GPU zones' 101 C one. Without them the GPU zones, whose - * placeholder readings never warm up, held all 14 CPUs to about 7.5 W - * (1.26/1.02/1.26 GHz) under any all-core load. The GPU zones also - * carry the die's sustainable power rather than the allocator's - * estimate from the lowest CPU states (about 2.6 W). - * - * The fans stay with the SMC, as on macOS: macOS writes no SMC key at - * runtime and its fans run in the SMC's own mode, which ramps them - * under sustained load. No zone has active trips; the hwmon fans stay - * cooling devices for userspace and manual control. - * - * sustainable-power is what the CPUs dissipate with the die held at - * its operating point: 720 s of all-core load (10 P, 4 E busy loops), - * headless, SMC fans in their own mode. Over the last 600 s TCMz held - * 112.0 to 113.8 C with the PMP limiting the P clusters to a mean of - * about 3.7 GHz and the fans at 3450/3730 rpm (where macOS settles - * too). The SMC core rails then read P0 25.3 W, P1 23.9 W and E 2.1 W - * on average, the units of the energy model. Each zone gets the sum - * over the clusters it throttles. Without it the power allocator - * estimates a budget from the cooling devices' lowest states, which - * throttles far below what this machine sustains. - * - * All of these values were measured on the J616s. The J614s and J773s - * inherit them until they are measured: Apple's package power limits - * for the J614s are about 78% (CPU) and 90% (GPU) of the J616s ones, - * so its budgets are generous here, and these zones are a backstop - * behind the PMP. + * sustainable-power is the J616s's: a 720 s all-core load held TCMz + * at 112-114 C with P0 25.3 W, P1 23.9 W and E 2.1 W on the SMC core + * rails. The J614s and J773s inherit these values until measured. */ thermal-zones { cpu-die-thermal { diff --git a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-hdmi.dtsi b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-hdmi.dtsi index f828c64d3ccf3..0e4e59ca5bb3a 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-hdmi.dtsi +++ b/arch/arm64/boot/dts/apple/t6040-j616s-extdisp-hdmi.dtsi @@ -14,12 +14,10 @@ /* * DISPEXT0 may only be powered once the PMP has acknowledged it in its - * device-state table (SOC-DEV-PS-REQ/ACK, PTD entries 480/488 on T6041): the - * soc-device record of DISPEXT0 has ID 18 (ADT iop-pmp-nub soc-device, ack - * flag set), so its request bit is 17. Without it, enabling the DISPEXT0 PMGR - * chain hung the machine before root. - * Same contract as the T6030 PMP device-state provider of - * aurora-silicon/linux#358, through the existing pmp-report entries here. + * device-state table (SOC-DEV-PS-REQ/ACK, PTD entries 480/488 on T6041): + * its ADT iop-pmp-nub soc-device ID is 18, so its request bit is 17. + * Without it, enabling the DISPEXT0 PMGR chain hung the machine before + * root. The T6030 PMP device-state provider works the same way. */ &pmp_report { pmp_dispext0: report@11 { diff --git a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi index c82c82c8d6063..368503f7f4884 100644 --- a/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +++ b/arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi @@ -391,17 +391,12 @@ &smc_hwmon { /* - * Every key here and in the zone sensors is in this machine's SMC key - * table as a readable float and was read on the J616s (SMC firmware - * of macOS 26.6.2). - * The J614s key table has not been read yet. - * Keys that only ever read a fixed placeholder (Tz1*, Ta0*) or a - * fixed limit (TVMx, TVmS, TVms, PHPB, PHPM) are left out; rails that - * read 0 W while idle are kept. GPU (Tg*), P-cluster (Tp*) and - * E-cluster (Te*) labels follow load tests: Tg* only read live while - * the GPU is powered and rise with GPU load, Tp* and Te* rise with CPU - * load. Other names follow the SMC key groups and are not otherwise - * verified. SBA1-3 are the three cells of the 3S battery. + * Every key here and in the zone sensors is a readable float in the + * J616s SMC key table (macOS 26.6.2); the J614s table has not been + * read. Keys that only read a placeholder (Tz1*, Ta0*) or a fixed + * limit (TVMx, TVmS, TVms, PHPB, PHPM) are left out. Tg*, Tp* and Te* + * labels follow GPU and CPU load tests; the others follow the SMC key + * groups. SBA1-3 are the cells of the 3S battery. */ temperature-TAOL { apple,key-id = "TAOL"; diff --git a/arch/arm64/boot/dts/apple/t604x.dtsi b/arch/arm64/boot/dts/apple/t604x.dtsi index a7c076c750c0a..fa1155e583947 100644 --- a/arch/arm64/boot/dts/apple/t604x.dtsi +++ b/arch/arm64/boot/dts/apple/t604x.dtsi @@ -326,19 +326,17 @@ }; /* - * DVFS states from the ADT: /arm-io/pmgr voltage-states1-sram (E), - * voltage-states5-sram (P0) and voltage-states13-sram (P1), word 0 - * in kHz. opp-level is the hardware p-state. Each P cluster has its - * own table even though the frequencies are the same: opp-shared - * means one clock domain per table. + * DVFS states from the ADT /arm-io/pmgr voltage-states1-sram (E), + * voltage-states5-sram (P0) and voltage-states13-sram (P1), word 0 in + * kHz; opp-level is the hardware p-state. Each P cluster has its own + * table: opp-shared means one clock domain per table. * - * opp-microwatt is the power of one busy core, measured on a J616s - * from the SMC core-rail meters (P0 PR0b, P1 PP0b, E PP2b) with the - * cluster pinned at each state. The P values follow a k * V^2 * f + c - * fit to the sweep, because the PMP's die-temperature limit clips the - * two top states within seconds. One busy E core does not register on - * its meter below 2352 MHz, so the E values are the idle cluster plus - * a quarter of the four-core increase. + * opp-microwatt is one busy core's power on a J616s, from the SMC + * core-rail meters (P0 PR0b, P1 PP0b, E PP2b). The P values follow a + * k * V^2 * f + c fit, as the PMP clips the two top states within + * seconds; the E values are the idle cluster plus a quarter of the + * four-core increase, since one E core does not register below + * 2352 MHz. */ opp_e: opp-table-e { compatible = "operating-points-v2"; @@ -1066,19 +1064,15 @@ }; /* - * PMC voter interface: the floor word of agent a at "voters" + - * 0x4000 * a, the floors the PMC honours and the rail enable words - * at "rails". Both lie inside pmgr_dcp's range, which the DCP driver - * only hands to its firmware, so the two do not conflict; "rails" - * comes first so that this node's unit address differs from - * pmgr_dcp's. + * PMC voter interface: agent a's floor word at "voters" + 0x4000 * a, + * and the rail enables at "rails". Both lie inside pmgr_dcp's range, + * which the DCP driver only hands to its firmware; "rails" comes first + * so this node's unit address differs from pmgr_dcp's. + * * Static voters are the PMP (0), CLPC (1) and AP (3). The PMP votes - * the DCS and fabric for memory clients other than the CPUs, the GPU - * among them; without its agent, GPU work runs at a low DCS - * state unless a CPU is busy. iBoot leaves the PMP's floor at the top - * DCS state, so its agent must stay off while the PMP does not run: - * apple,pmp holds off the PMC until the PMP driver has bound, and - * unbinds the PMC first. + * the DCS and fabric for non-CPU memory clients such as the GPU, and + * iBoot leaves its floor at the top DCS state, so apple,pmp keeps the + * PMC off until the PMP driver has bound. */ pmc: power-management@5048aa000 { compatible = "apple,t6041-pmc"; diff --git a/arch/arm64/boot/dts/apple/t8132-usb4.dtsi b/arch/arm64/boot/dts/apple/t8132-usb4.dtsi index 19e9f02caecea..f137650f9121c 100644 --- a/arch/arm64/boot/dts/apple/t8132-usb4.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-usb4.dtsi @@ -275,10 +275,9 @@ * beside it. ACIO populates each container once the router has a PCIe tunnel, * and the kernel cold-initializes the port (apple,pciec-kernel-init). * - * apple,tunable-rc, -fabric, -debug and the port's apple,tunable come from the - * board, which a bootloader may fill in instead. The oe-fabric - * block and its tunable belong to the port's PIO-DMA engine in the ADT, which - * no bootloader passes on, so they are described here. + * The calibration is in t8132-pciec-tunables.dtsi. The oe-fabric block and + * its tunable belong to the port's PIO-DMA engine in the ADT, which no + * bootloader passes on, so they are described here. */ / { usb4_0_pcie_tunnel: usb4-pcie-tunnel-0 { From 108975e3f912c5330a1dd7862e6fc65f295cd6bf Mon Sep 17 00:00:00 2001 From: DjDeveloperr Date: Sat, 7 Nov 2026 11:48:29 -0500 Subject: [PATCH 16/17] arm64: dts: apple: t8132-j713: say what the PMGR policy leaves to the board t8132-j713-pmgr.dtsi disables ps_gfx and the ATC0/ATC1 PCIe and CIO domains, which the J713 and J715 trees then enable for the GPU and USB4. The legacy-loader adapter, which includes the policy too, enables only ps_gfx. Say so in the header, so the policy and the later files do not read as a contradiction. Every label in the policy names a device in the J713 ADT pmgr table except isp_dprx; the ADT has ISP_C and ISP_KA instead, which the tree does not describe. That is left as it is. Comment only; the dtbs are byte-identical. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi b/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi index 1e714aab47118..7f0e91c4002eb 100644 --- a/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi +++ b/arch/arm64/boot/dts/apple/t8132-j713-pmgr.dtsi @@ -1,12 +1,15 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * J713 power-domain ownership. + * J713 and J715 power-domain ownership, also used by the legacy-loader + * adapter (drivers/soc/apple/t8132-platform-data.dts). * - * Only the domains whose Linux power/reset contract is qualified are enabled. - * Retained core, GPIO and display domains are firmware-owned: neither state - * reads nor power/reset writes are permitted. Other domains stay unavailable - * until their consumer and power sequence are implemented. This board policy - * is also used by the adapter for the original J713 loader tree. + * Only domains with a qualified Linux power/reset contract are enabled. + * Retained core, GPIO and display domains are firmware-owned: no state + * reads and no power/reset writes. The board tree enables ps_gfx and the + * ATC0/ATC1 PCIe and CIO domains afterwards for the GPU and USB4; the + * adapter enables only ps_gfx. + * + * Copyright The Asahi Linux Contributors */ &ps_msg { From 5ee12f0a693093400d4bdc9d51387871166d8649 Mon Sep 17 00:00:00 2001 From: Diljit Singh Date: Sat, 7 Nov 2026 12:36:37 -0500 Subject: [PATCH 17/17] Revert "arm64: dts: apple: t6040-j616s: give the panel the 16-inch width" The J616s publishes 345 mm in its panel EDID (75e950202a6), and the apple-dcp j616s-panel-identity test checks it against this node. Keep the hardware-tested value; 3456 px at 254 ppi is 345.6 mm either way. This reverts commit d3a3629e234. Signed-off-by: Diljit Singh --- arch/arm64/boot/dts/apple/t6040-j616s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts index 9ca8cecd5f849..6d4da720bbbbf 100644 --- a/arch/arm64/boot/dts/apple/t6040-j616s.dts +++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts @@ -52,7 +52,7 @@ &panel { compatible = "apple,panel-j616", "apple,panel-mini-led", "apple,panel"; - width-mm = <346>; + width-mm = <345>; height-mm = <223>; adj-height-mm = <216>; /* "Wide color (P3)" in the Apple technical specifications */