* [PATCH] arm64: dts: apple: Remove undocumented, unapproved aliases
@ 2026-11-17 13:06 Krzysztof Kozlowski
2026-11-17 13:24 ` sashiko-bot
0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Kozlowski @ 2026-11-17 13:06 UTC (permalink / raw)
To: Sven Peter, Janne Grunau, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, asahi, linux-arm-kernel,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski
The atcphy and touchbar aliases were never approved by Devicetree
maintainers, because they were never documented as actual ABI. Drop
them, because no new custom aliases are allowed for years now.
This might break users of this undocumented ABI, so these should be
updated to use only documented and approved ABI.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
arch/arm64/boot/dts/apple/t6002-j375d.dts | 4 ----
arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 4 ----
arch/arm64/boot/dts/apple/t600x-j375.dtsi | 4 ----
arch/arm64/boot/dts/apple/t6022-j180d.dts | 8 --------
arch/arm64/boot/dts/apple/t6022-j475d.dts | 4 ----
arch/arm64/boot/dts/apple/t8103-j293.dts | 8 --------
arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 --
arch/arm64/boot/dts/apple/t8112-j493.dts | 1 -
arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 2 --
9 files changed, 37 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t6002-j375d.dts b/arch/arm64/boot/dts/apple/t6002-j375d.dts
index e6eb6b6c386d..9f0476e1ae2f 100644
--- a/arch/arm64/boot/dts/apple/t6002-j375d.dts
+++ b/arch/arm64/boot/dts/apple/t6002-j375d.dts
@@ -15,10 +15,6 @@
/ {
compatible = "apple,j375d", "apple,t6002", "apple,arm-platform";
model = "Apple Mac Studio (M1 Ultra, 2022)";
- aliases {
- atcphy4 = &atcphy0_die1;
- atcphy5 = &atcphy1_die1;
- };
};
/* USB Type C */
diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
index caded1636f3d..1a745c6593fa 100644
--- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
@@ -15,10 +15,6 @@ / {
chassis-type = "laptop";
aliases {
- atcphy0 = &atcphy0;
- atcphy1 = &atcphy1;
- atcphy2 = &atcphy2;
- atcphy3 = &atcphy3;
bluetooth0 = &bluetooth0;
serial0 = &serial0;
wifi0 = &wifi0;
diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
index 8a1494949e4c..3540edc56b0d 100644
--- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
@@ -13,10 +13,6 @@ / {
chassis-type = "desktop";
aliases {
- atcphy0 = &atcphy0;
- atcphy1 = &atcphy1;
- atcphy2 = &atcphy2;
- atcphy3 = &atcphy3;
bluetooth0 = &bluetooth0;
ethernet0 = ðernet0;
serial0 = &serial0;
diff --git a/arch/arm64/boot/dts/apple/t6022-j180d.dts b/arch/arm64/boot/dts/apple/t6022-j180d.dts
index f76b887429dd..0b1f1bc46270 100644
--- a/arch/arm64/boot/dts/apple/t6022-j180d.dts
+++ b/arch/arm64/boot/dts/apple/t6022-j180d.dts
@@ -18,14 +18,6 @@ / {
chassis-type = "server";
aliases {
- atcphy0 = &atcphy0;
- atcphy1 = &atcphy1;
- atcphy2 = &atcphy2;
- atcphy3 = &atcphy3;
- atcphy4 = &atcphy0_die1;
- atcphy5 = &atcphy1_die1;
- atcphy6 = &atcphy2_die1;
- atcphy7 = &atcphy3_die1;
nvram = &nvram;
serial0 = &serial0;
};
diff --git a/arch/arm64/boot/dts/apple/t6022-j475d.dts b/arch/arm64/boot/dts/apple/t6022-j475d.dts
index 32938a3bf96a..4fc9a42160ea 100644
--- a/arch/arm64/boot/dts/apple/t6022-j475d.dts
+++ b/arch/arm64/boot/dts/apple/t6022-j475d.dts
@@ -17,10 +17,6 @@ / {
compatible = "apple,j475d", "apple,t6022", "apple,arm-platform";
model = "Apple Mac Studio (M2 Ultra, 2023)";
- aliases {
- atcphy4 = &atcphy0_die1;
- atcphy5 = &atcphy1_die1;
- };
};
&framebuffer0 {
diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts
index 1d074b9e6018..779da65a66e3 100644
--- a/arch/arm64/boot/dts/apple/t8103-j293.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
@@ -18,14 +18,6 @@ / {
model = "Apple MacBook Pro (13-inch, M1, 2020)";
chassis-type = "laptop";
- /*
- * All of those are used by the bootloader to pass calibration
- * blobs and other device-specific properties
- */
- aliases {
- touchbar0 = &touchbar0;
- };
-
led-controller {
compatible = "pwm-leds";
led-0 {
diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
index 686fb1dd215d..5304a5591984 100644
--- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
@@ -15,8 +15,6 @@ aliases {
serial0 = &serial0;
serial2 = &serial2;
wifi0 = &wifi0;
- atcphy0 = &atcphy0;
- atcphy1 = &atcphy1;
};
chosen {
diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts
index 7cea5c594810..b0c93788c72a 100644
--- a/arch/arm64/boot/dts/apple/t8112-j493.dts
+++ b/arch/arm64/boot/dts/apple/t8112-j493.dts
@@ -24,7 +24,6 @@ / {
*/
aliases {
bluetooth0 = &bluetooth0;
- touchbar0 = &touchbar0;
wifi0 = &wifi0;
};
diff --git a/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi
index 562e7a25a1e8..31d8d2aaf30b 100644
--- a/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi
+++ b/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi
@@ -11,8 +11,6 @@
/ {
aliases {
- atcphy0 = &atcphy0;
- atcphy1 = &atcphy1;
serial0 = &serial0;
serial2 = &serial2;
};
--
2.53.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: apple: Remove undocumented, unapproved aliases
2026-11-17 13:06 [PATCH] arm64: dts: apple: Remove undocumented, unapproved aliases Krzysztof Kozlowski
@ 2026-11-17 13:24 ` sashiko-bot
2026-11-17 13:41 ` Krzysztof Kozlowski
0 siblings, 1 reply; 3+ messages in thread
From: sashiko-bot @ 2026-11-17 13:24 UTC (permalink / raw)
To: Krzysztof Kozlowski, devicetree; +Cc: robh, conor+dt
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] arm64: dts: apple: removing aliases breaks atcphy_probe() and
Z2 calibration
--
commit aa4c33e989489cbc224f3300ed3e06e23d8eea9a
Author: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
arm64: dts: apple: Remove undocumented, unapproved aliases
This commit removes the atcphy0..atcphy7 and touchbar0 aliases from the
Apple M1 and M2 devicetrees.
[ ... ]
> diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts
> index 1d074b9e60183..779da65a66e31 100644
> --- a/arch/arm64/boot/dts/apple/t8103-j293.dts
> +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
> @@ -18,14 +18,6 @@ / {
> model = "Apple MacBook Pro (13-inch, M1, 2020)";
> chassis-type = "laptop";
>
> - /*
> - * All of those are used by the bootloader to pass calibration
> - * blobs and other device-specific properties
> - */
> - aliases {
> - touchbar0 = &touchbar0;
> - };
> -
> led-controller {
> compatible = "pwm-leds";
> led-0 {
> diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> index 686fb1dd215d2..5304a5591984d 100644
> --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
> @@ -15,8 +15,6 @@ aliases {
> serial0 = &serial0;
> serial2 = &serial2;
> wifi0 = &wifi0;
> - atcphy0 = &atcphy0;
> - atcphy1 = &atcphy1;
> };
>
> chosen {
[Severity: High]
Does removing the atcphy and touchbar aliases across these devicetrees cause a
regression in atcphy_probe() and Touch Bar digitizer calibration when booting
with the m1n1 bootloader?
As described in Documentation/devicetree/bindings/phy/apple,atcphy.yaml and
Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml,
m1n1 resolves /aliases/atcphy0..atcphy7 and /aliases/touchbar0 to copy
per-device factory calibration data from Apple's ADT into the FDT at boot
(and on Ultra SoCs in t6002-j375d.dts, t6022-j475d.dts, and t6022-j180d.dts,
atcphy4..atcphy7 map flat ADT port indices onto the second die's
atcphy0_die1..atcphy3_die1 nodes).
Without the atcphy aliases, m1n1 does not populate the required
apple,tunable-* properties on the PHY nodes, so atcphy_probe() ->
atcphy_load_tunables() -> devm_apple_tunable_parse() fails with -ENOENT:
drivers/phy/apple/atc.c:atcphy_load_tunables() {
...
*tunables[i].tunable = devm_apple_tunable_parse(
atcphy->dev, atcphy->np, tunables[i].dt_name, tunables[i].res);
if (IS_ERR(*tunables[i].tunable)) {
dev_err(atcphy->dev, "Failed to read tunable %s: %ld\n",
tunables[i].dt_name, PTR_ERR(*tunables[i].tunable));
return PTR_ERR(*tunables[i].tunable);
}
}
Aborting atcphy_probe() before atcphy_probe_finalize() prevents registration
of the ATCPHY reset controller, Type-C mux, and USB/DP PHYs, which keeps all
integrated dwc3 USB Type-C controllers on M1 and M2 systems from probing.
Similarly, without touchbar0 in t8103-j293.dts and t8112-j493.dts, m1n1
cannot inject apple,z2-cal-blob, so apple_z2_build_cal_blob() returns NULL and
apple_z2_upload_firmware() boots the Touch Bar digitizer without its
factory calibration data.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261117130616.234953-2-krzysztof.kozlowski@oss.qualcomm.com?part=1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: apple: Remove undocumented, unapproved aliases
2026-11-17 13:24 ` sashiko-bot
@ 2026-11-17 13:41 ` Krzysztof Kozlowski
0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2026-11-17 13:41 UTC (permalink / raw)
To: sashiko-reviews, devicetree; +Cc: robh, conor+dt
On 17/11/2026 14:24, sashiko-bot@kernel.org wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential
> issue to consider:
> - [High] arm64: dts: apple: removing aliases breaks atcphy_probe() and
> Z2 calibration
> --
Life, you should not have add such undocumented ABI.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-17 13:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 13:06 [PATCH] arm64: dts: apple: Remove undocumented, unapproved aliases Krzysztof Kozlowski
2026-11-17 13:24 ` sashiko-bot
2026-11-17 13:41 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox