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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Documentation/devicetree/bindings/arm/apple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,10 @@ properties:

- description: Apple M5 Pro SoC based platforms
items:
- const: apple,j716s # MacBook Pro (16-inch, M5 Pro, 2026)
- enum:
- apple,j716s # MacBook Pro (16-inch, M5 Pro, 2026)
- apple,k114s # MacBook Pro (14-inch PROLED XDR, M5 Pro, 2026)
- apple,k116s # MacBook Pro (16-inch PROLED XDR, M5 Pro, 2026)
- const: apple,t6050
- const: apple,arm-platform

Expand All @@ -489,6 +492,8 @@ properties:
- enum:
- apple,j714c # MacBook Pro (14-inch, M5 Max, 2026)
- apple,j716c # MacBook Pro (16-inch, M5 Max, 2026)
- apple,k114c # MacBook Pro (14-inch PROLED XDR, M5 Max, 2026)
- apple,k116c # MacBook Pro (16-inch PROLED XDR, M5 Max, 2026)
- const: apple,t6050
- const: apple,arm-platform

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description: |
as HID devices over a DockChannel FIFO pair. The coprocessor announces its
interfaces by name when it boots. Each interface that the operating system
should use has a child node of the same name; announced interfaces without
a node are ignored.
a node are ignored, and so are interfaces whose node is disabled.

The multi-touch interface may need firmware that the host sends after the
coprocessor has booted, followed by a power cycle of the trackpad. Two
Expand Down Expand Up @@ -217,6 +217,20 @@ properties:
The trackpad accelerometer, under the name that the T6041 coprocessor
firmware announces.

kiwi:
type: object
additionalProperties: false
description:
The touchscreen of the MacBook Pros with a PROLED XDR display, an
interface of the same coprocessor as the trackpad.

properties:
firmware-name:
maxItems: 1
description:
Name of the touchscreen firmware that the host sends to the
coprocessor when the interface is first opened.

mtp:
type: object
additionalProperties: false
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/apple/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ dtb-$(CONFIG_ARCH_APPLE) += t6050-j714c.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-j716c.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-j716s.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-j775d.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-k114c.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-k114s.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-k116c.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6050-k116s.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j415.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
Expand Down
61 changes: 61 additions & 0 deletions arch/arm64/boot/dts/apple/t6050-die0.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,40 @@
power-domains = <&ps_i2c2>;
};

/*
* The three FPWM channels (ADT /arm-io/pwm0, pwm1, pwm2, "fpwm,s5l8920x") at
* 0x305040000, 0x305044000 and 0x305048000, clock gates FPWM0..FPWM2. The boards say
* what drives each one: on the MacBook Pros pwm0 is the keyboard backlight, and on the
* PROLED models pwm1 is the rear Apple logo. pwm1's power state is left off unless a
* board uses it, since J716c's ADT ties it to the indicator controller (eic).
*/
fpwm0: pwm@505040000 {
compatible = "apple,t6050-fpwm", "apple,s5l-fpwm";
reg = <0x5 0x05040000 0x0 0x4000>;
clocks = <&clkref>;
power-domains = <&ps_fpwm0>;
#pwm-cells = <2>;
status = "disabled";
};

fpwm1: pwm@505044000 {
compatible = "apple,t6050-fpwm", "apple,s5l-fpwm";
reg = <0x5 0x05044000 0x0 0x4000>;
clocks = <&clkref>;
power-domains = <&ps_fpwm1>;
#pwm-cells = <2>;
status = "disabled";
};

fpwm2: pwm@505048000 {
compatible = "apple,t6050-fpwm", "apple,s5l-fpwm";
reg = <0x5 0x05048000 0x0 0x4000>;
clocks = <&clkref>;
power-domains = <&ps_fpwm2>;
#pwm-cells = <2>;
status = "disabled";
};

/*
* The boot NOR (ADT /arm-io/qspi, "qspi,qspimc"): P at 0x305118000 and C at P + 0x800,
* each 0x4000 in the ADT; one resource for their union. Interrupt 1373, clock id 440
Expand Down Expand Up @@ -872,6 +906,33 @@
};

&pmgr1 {
ps_fpwm0: power-controller@2a8 {
compatible = "apple,t6050-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
reg = <0x2a8 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "fpwm0";
};

ps_fpwm1: power-controller@2b0 {
compatible = "apple,t6050-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
reg = <0x2b0 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "fpwm1";
/* On J716c the secure firmware's indicator controller names this state */
status = "disabled";
};

ps_fpwm2: power-controller@2b8 {
compatible = "apple,t6050-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
reg = <0x2b8 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "fpwm2";
status = "disabled";
};

ps_i2c1: power-controller@2c8 {
compatible = "apple,t6050-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
reg = <0x2c8 4>;
Expand Down
27 changes: 6 additions & 21 deletions arch/arm64/boot/dts/apple/t6050-j716s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,13 @@
};
};

/* Blocks t6050-die0.dtsi does not describe yet: the keyboard backlight PWM and the third HPM bus */
&die0 {
/* ADT pwm0: 0x505040000, clock gate FPWM0 */
fpwm0: pwm@505040000 {
compatible = "apple,t6050-fpwm", "apple,s5l-fpwm";
reg = <0x5 0x05040000 0x0 0x4000>;
power-domains = <&ps_fpwm0>;
clocks = <&clkref>;
#pwm-cells = <2>;
};
/* The keyboard backlight PWM (ADT pwm0) */
&fpwm0 {
status = "okay";
};

/* A block t6050-die0.dtsi does not describe yet: the third HPM bus */
&die0 {
/*
* ADT nub-spmi-a1, the right-hand port's HPM bus (hpm2). Polled like a0:
* the generation 4 driver takes no interrupt. pmgr NUB_SPMI_A1 is
Expand All @@ -84,17 +80,6 @@
};
};

/* pmgr FPWM0, group 1 + 0x2a8; its SIO parent is left undescribed, as for ps_i2c1/2 */
&pmgr1 {
ps_fpwm0: power-controller@2a8 {
compatible = "apple,t6050-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
reg = <0x2a8 4>;
#power-domain-cells = <0>;
#reset-cells = <0>;
label = "fpwm0";
};
};

/*
* PCIe port 0: the N1 (Wi-Fi and Bluetooth). Port 1 is the SD reader, not yet
* described. The registers, interrupt, DART streams and PERST# pin are the
Expand Down
Loading
Loading