* [PATCH 1/5] arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
@ 2025-08-13 9:53 ` Janne Grunau via B4 Relay
2025-08-13 9:53 ` [PATCH 2/5] arm64: dts: apple: t600x: Comple WiFi properties Janne Grunau via B4 Relay
` (5 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Janne Grunau via B4 Relay @ 2025-08-13 9:53 UTC (permalink / raw)
To: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mark Kettenis, Hector Martin
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
From: Janne Grunau <j@jannau.net>
PCIe `port01` of t8103-j457 (iMac, M1, 2 USB-C ports, 2021) is unused
and disabled. Linux' PCI subsystem assigns the ethernet nic from
`port02` to bus 02. This results into assigning `pcie0_dart_1` from the
disabled port as iommu. The `pcie0_dart_1` instance is disabled and
probably fused off (it is on the M2 Pro Mac mini which has a disabled
PCIe port as well).
Without iommu the ethernet nic is not expected work.
Adjusts the "bus-range" and the PCIe devices "reg" property to PCI
subsystem's bus number.
Fixes: 7c77ab91b33d ("arm64: dts: apple: Add missing M1 (t8103) devices")
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t8103-j457.dts | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8103-j457.dts b/arch/arm64/boot/dts/apple/t8103-j457.dts
index 152f95fd49a2118093396838fbd8b6bd1b518f81..7089ccf3ce55661f3f83810496daed40c8199189 100644
--- a/arch/arm64/boot/dts/apple/t8103-j457.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j457.dts
@@ -21,6 +21,14 @@ aliases {
};
};
+/*
+ * Adjust pcie0's iommu-map to account for the disabled port01.
+ */
+&pcie0 {
+ iommu-map = <0x100 &pcie0_dart_0 1 1>,
+ <0x200 &pcie0_dart_2 1 1>;
+};
+
&bluetooth0 {
brcm,board-type = "apple,santorini";
};
@@ -36,10 +44,10 @@ &wifi0 {
*/
&port02 {
- bus-range = <3 3>;
+ bus-range = <2 2>;
status = "okay";
ethernet0: ethernet@0,0 {
- reg = <0x30000 0x0 0x0 0x0 0x0>;
+ reg = <0x20000 0x0 0x0 0x0 0x0>;
/* To be filled by the loader */
local-mac-address = [00 10 18 00 00 00];
};
--
2.50.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/5] arm64: dts: apple: t600x: Comple WiFi properties
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
2025-08-13 9:53 ` [PATCH 1/5] arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map Janne Grunau via B4 Relay
@ 2025-08-13 9:53 ` Janne Grunau via B4 Relay
2025-08-20 19:09 ` Rob Herring
2025-08-13 9:53 ` [PATCH 3/5] arm64: dts: apple: t600x: Add bluetooth device nodes Janne Grunau via B4 Relay
` (4 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Janne Grunau via B4 Relay @ 2025-08-13 9:53 UTC (permalink / raw)
To: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mark Kettenis, Hector Martin
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
From: Hector Martin <marcan@marcan.st>
Add compatible and antenna-sku properties to the shared node and
brcm,board-type property to individuall board device trees.
module and antenna properties
Signed-off-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6000-j314s.dts | 4 ++++
arch/arm64/boot/dts/apple/t6000-j316s.dts | 4 ++++
arch/arm64/boot/dts/apple/t6001-j314c.dts | 4 ++++
arch/arm64/boot/dts/apple/t6001-j316c.dts | 4 ++++
arch/arm64/boot/dts/apple/t6001-j375c.dts | 4 ++++
arch/arm64/boot/dts/apple/t6002-j375d.dts | 4 ++++
arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 2 ++
arch/arm64/boot/dts/apple/t600x-j375.dtsi | 2 ++
8 files changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/apple/t6000-j314s.dts b/arch/arm64/boot/dts/apple/t6000-j314s.dts
index c9e192848fe3f9f91c3c305e169b949a45e7f7e3..ac35870ca129ce353b04296800b197bf684d0bd7 100644
--- a/arch/arm64/boot/dts/apple/t6000-j314s.dts
+++ b/arch/arm64/boot/dts/apple/t6000-j314s.dts
@@ -16,3 +16,7 @@ / {
compatible = "apple,j314s", "apple,t6000", "apple,arm-platform";
model = "Apple MacBook Pro (14-inch, M1 Pro, 2021)";
};
+
+&wifi0 {
+ brcm,board-type = "apple,maldives";
+};
diff --git a/arch/arm64/boot/dts/apple/t6000-j316s.dts b/arch/arm64/boot/dts/apple/t6000-j316s.dts
index ff1803ce23001c7817a336456bed626adc3931e3..77d6d8c14d741e9b6a0dc44f764ea54f966e0d59 100644
--- a/arch/arm64/boot/dts/apple/t6000-j316s.dts
+++ b/arch/arm64/boot/dts/apple/t6000-j316s.dts
@@ -16,3 +16,7 @@ / {
compatible = "apple,j316s", "apple,t6000", "apple,arm-platform";
model = "Apple MacBook Pro (16-inch, M1 Pro, 2021)";
};
+
+&wifi0 {
+ brcm,board-type = "apple,madagascar";
+};
diff --git a/arch/arm64/boot/dts/apple/t6001-j314c.dts b/arch/arm64/boot/dts/apple/t6001-j314c.dts
index 1761d15b98c12f9f6a19798e10d0544805538397..0a5655792a8f1cb6d0029bf9f967aa74cf6c01f7 100644
--- a/arch/arm64/boot/dts/apple/t6001-j314c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j314c.dts
@@ -16,3 +16,7 @@ / {
compatible = "apple,j314c", "apple,t6001", "apple,arm-platform";
model = "Apple MacBook Pro (14-inch, M1 Max, 2021)";
};
+
+&wifi0 {
+ brcm,board-type = "apple,maldives";
+};
diff --git a/arch/arm64/boot/dts/apple/t6001-j316c.dts b/arch/arm64/boot/dts/apple/t6001-j316c.dts
index 750e9beeffc0aa87f1dcac1b57dddf78184ddd47..9c215531ea543e9afe8c131f7c8dc68cfaae666c 100644
--- a/arch/arm64/boot/dts/apple/t6001-j316c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j316c.dts
@@ -16,3 +16,7 @@ / {
compatible = "apple,j316c", "apple,t6001", "apple,arm-platform";
model = "Apple MacBook Pro (16-inch, M1 Max, 2021)";
};
+
+&wifi0 {
+ brcm,board-type = "apple,madagascar";
+};
diff --git a/arch/arm64/boot/dts/apple/t6001-j375c.dts b/arch/arm64/boot/dts/apple/t6001-j375c.dts
index 62ea437b58b25ca649e20b1072b4d835bbc17d3a..88ca2037556cec4307d27bba0244d7ba7f45b184 100644
--- a/arch/arm64/boot/dts/apple/t6001-j375c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j375c.dts
@@ -16,3 +16,7 @@ / {
compatible = "apple,j375c", "apple,t6001", "apple,arm-platform";
model = "Apple Mac Studio (M1 Max, 2022)";
};
+
+&wifi0 {
+ brcm,board-type = "apple,okinawa";
+};
diff --git a/arch/arm64/boot/dts/apple/t6002-j375d.dts b/arch/arm64/boot/dts/apple/t6002-j375d.dts
index 3365429bdc8be90b63c8051822243d897854ab27..f56d13b37eaff1c3c14815575a71024661669296 100644
--- a/arch/arm64/boot/dts/apple/t6002-j375d.dts
+++ b/arch/arm64/boot/dts/apple/t6002-j375d.dts
@@ -38,6 +38,10 @@ hpm5: usb-pd@3a {
};
};
+&wifi0 {
+ brcm,board-type = "apple,okinawa";
+};
+
/* delete unused always-on power-domains on die 1 */
/delete-node/ &ps_atc2_usb_aon_die1;
diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
index 22ebc78e120bf8f0f71fd532e9dce4dcd117bbc6..b699672a5543c1c172f9a788d36287c0b09051e1 100644
--- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
@@ -99,9 +99,11 @@ &port00 {
/* WLAN */
bus-range = <1 1>;
wifi0: wifi@0,0 {
+ compatible = "pci14e4,4433";
reg = <0x10000 0x0 0x0 0x0 0x0>;
/* To be filled by the loader */
local-mac-address = [00 10 18 00 00 10];
+ apple,antenna-sku = "XX";
};
};
diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
index d5b985ad567936111ee5cccc9ca9fc23d01d9edf..95560bf3798bfebe133afafba674005a3e62ddcc 100644
--- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
@@ -84,9 +84,11 @@ &port00 {
/* WLAN */
bus-range = <1 1>;
wifi0: wifi@0,0 {
+ compatible = "pci14e4,4433";
reg = <0x10000 0x0 0x0 0x0 0x0>;
/* To be filled by the loader */
local-mac-address = [00 10 18 00 00 10];
+ apple,antenna-sku = "XX";
};
};
--
2.50.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/5] arm64: dts: apple: t600x: Comple WiFi properties
2025-08-13 9:53 ` [PATCH 2/5] arm64: dts: apple: t600x: Comple WiFi properties Janne Grunau via B4 Relay
@ 2025-08-20 19:09 ` Rob Herring
2025-08-21 10:29 ` Janne Grunau
0 siblings, 1 reply; 12+ messages in thread
From: Rob Herring @ 2025-08-20 19:09 UTC (permalink / raw)
To: Janne Grunau
Cc: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Krzysztof Kozlowski,
Conor Dooley, Mark Kettenis, Hector Martin, asahi,
linux-arm-kernel, devicetree, linux-kernel
On Wed, Aug 13, 2025 at 11:53:34AM +0200, Janne Grunau wrote:
> From: Hector Martin <marcan@marcan.st>
What does 'Comple' in the subject mean?
>
> Add compatible and antenna-sku properties to the shared node and
> brcm,board-type property to individuall board device trees.
> module and antenna properties
>
> Signed-off-by: Hector Martin <marcan@marcan.st>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
> arch/arm64/boot/dts/apple/t6000-j314s.dts | 4 ++++
> arch/arm64/boot/dts/apple/t6000-j316s.dts | 4 ++++
> arch/arm64/boot/dts/apple/t6001-j314c.dts | 4 ++++
> arch/arm64/boot/dts/apple/t6001-j316c.dts | 4 ++++
> arch/arm64/boot/dts/apple/t6001-j375c.dts | 4 ++++
> arch/arm64/boot/dts/apple/t6002-j375d.dts | 4 ++++
> arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 2 ++
> arch/arm64/boot/dts/apple/t600x-j375.dtsi | 2 ++
> 8 files changed, 28 insertions(+)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] arm64: dts: apple: t600x: Comple WiFi properties
2025-08-20 19:09 ` Rob Herring
@ 2025-08-21 10:29 ` Janne Grunau
0 siblings, 0 replies; 12+ messages in thread
From: Janne Grunau @ 2025-08-21 10:29 UTC (permalink / raw)
To: Rob Herring
Cc: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Krzysztof Kozlowski,
Conor Dooley, Mark Kettenis, Hector Martin, asahi,
linux-arm-kernel, devicetree, linux-kernel
On Wed, Aug 20, 2025 at 02:09:20PM -0500, Rob Herring wrote:
> On Wed, Aug 13, 2025 at 11:53:34AM +0200, Janne Grunau wrote:
> > From: Hector Martin <marcan@marcan.st>
>
> What does 'Comple' in the subject mean?
'Complete'. I've changed it locally to
"arm64: dts: apple: t600x: Add missing WiFi properties" and removed
stray words from the end of the commit message.
Janne
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/5] arm64: dts: apple: t600x: Add bluetooth device nodes
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
2025-08-13 9:53 ` [PATCH 1/5] arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map Janne Grunau via B4 Relay
2025-08-13 9:53 ` [PATCH 2/5] arm64: dts: apple: t600x: Comple WiFi properties Janne Grunau via B4 Relay
@ 2025-08-13 9:53 ` Janne Grunau via B4 Relay
2025-08-13 9:53 ` [PATCH 4/5] dt-bindings: arm: apple: Add t8112 j415 compatible Janne Grunau via B4 Relay
` (3 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Janne Grunau via B4 Relay @ 2025-08-13 9:53 UTC (permalink / raw)
To: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mark Kettenis, Hector Martin
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
From: Hector Martin <marcan@marcan.st>
Add bluetooth PCIe device nodes to specify per device brcm,board-type
and provide the bootloader filled "local-bd-address" and calibration
data.
Signed-off-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/t6000-j314s.dts | 4 ++++
arch/arm64/boot/dts/apple/t6000-j316s.dts | 4 ++++
arch/arm64/boot/dts/apple/t6001-j314c.dts | 4 ++++
arch/arm64/boot/dts/apple/t6001-j316c.dts | 4 ++++
arch/arm64/boot/dts/apple/t6001-j375c.dts | 4 ++++
arch/arm64/boot/dts/apple/t6002-j375d.dts | 4 ++++
arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 8 ++++++++
arch/arm64/boot/dts/apple/t600x-j375.dtsi | 8 ++++++++
8 files changed, 40 insertions(+)
diff --git a/arch/arm64/boot/dts/apple/t6000-j314s.dts b/arch/arm64/boot/dts/apple/t6000-j314s.dts
index ac35870ca129ce353b04296800b197bf684d0bd7..1430b91ff1b152e5a23025d5377f189601bb5a09 100644
--- a/arch/arm64/boot/dts/apple/t6000-j314s.dts
+++ b/arch/arm64/boot/dts/apple/t6000-j314s.dts
@@ -20,3 +20,7 @@ / {
&wifi0 {
brcm,board-type = "apple,maldives";
};
+
+&bluetooth0 {
+ brcm,board-type = "apple,maldives";
+};
diff --git a/arch/arm64/boot/dts/apple/t6000-j316s.dts b/arch/arm64/boot/dts/apple/t6000-j316s.dts
index 77d6d8c14d741e9b6a0dc44f764ea54f966e0d59..da0cbe7d96736b1491497243bdbd1d13c9ab6c62 100644
--- a/arch/arm64/boot/dts/apple/t6000-j316s.dts
+++ b/arch/arm64/boot/dts/apple/t6000-j316s.dts
@@ -20,3 +20,7 @@ / {
&wifi0 {
brcm,board-type = "apple,madagascar";
};
+
+&bluetooth0 {
+ brcm,board-type = "apple,madagascar";
+};
diff --git a/arch/arm64/boot/dts/apple/t6001-j314c.dts b/arch/arm64/boot/dts/apple/t6001-j314c.dts
index 0a5655792a8f1cb6d0029bf9f967aa74cf6c01f7..c37097dcfdb304d8fcdf77de82e494e158d94c72 100644
--- a/arch/arm64/boot/dts/apple/t6001-j314c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j314c.dts
@@ -20,3 +20,7 @@ / {
&wifi0 {
brcm,board-type = "apple,maldives";
};
+
+&bluetooth0 {
+ brcm,board-type = "apple,maldives";
+};
diff --git a/arch/arm64/boot/dts/apple/t6001-j316c.dts b/arch/arm64/boot/dts/apple/t6001-j316c.dts
index 9c215531ea543e9afe8c131f7c8dc68cfaae666c..3bc6e0c3294cf98c89dddfb4891eefbe8aae7020 100644
--- a/arch/arm64/boot/dts/apple/t6001-j316c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j316c.dts
@@ -20,3 +20,7 @@ / {
&wifi0 {
brcm,board-type = "apple,madagascar";
};
+
+&bluetooth0 {
+ brcm,board-type = "apple,madagascar";
+};
diff --git a/arch/arm64/boot/dts/apple/t6001-j375c.dts b/arch/arm64/boot/dts/apple/t6001-j375c.dts
index 88ca2037556cec4307d27bba0244d7ba7f45b184..2e7c23714d4d0007b7096d469f32c689944c85ff 100644
--- a/arch/arm64/boot/dts/apple/t6001-j375c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j375c.dts
@@ -20,3 +20,7 @@ / {
&wifi0 {
brcm,board-type = "apple,okinawa";
};
+
+&bluetooth0 {
+ brcm,board-type = "apple,okinawa";
+};
diff --git a/arch/arm64/boot/dts/apple/t6002-j375d.dts b/arch/arm64/boot/dts/apple/t6002-j375d.dts
index f56d13b37eaff1c3c14815575a71024661669296..2b7f80119618ad1b497b67597c55968585bd92a9 100644
--- a/arch/arm64/boot/dts/apple/t6002-j375d.dts
+++ b/arch/arm64/boot/dts/apple/t6002-j375d.dts
@@ -42,6 +42,10 @@ &wifi0 {
brcm,board-type = "apple,okinawa";
};
+&bluetooth0 {
+ brcm,board-type = "apple,okinawa";
+};
+
/* delete unused always-on power-domains on die 1 */
/delete-node/ &ps_atc2_usb_aon_die1;
diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
index b699672a5543c1c172f9a788d36287c0b09051e1..c0aac59a6fae4f6f4b387483665349a8e2521c1e 100644
--- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
@@ -13,6 +13,7 @@
/ {
aliases {
+ bluetooth0 = &bluetooth0;
serial0 = &serial0;
wifi0 = &wifi0;
};
@@ -105,6 +106,13 @@ wifi0: wifi@0,0 {
local-mac-address = [00 10 18 00 00 10];
apple,antenna-sku = "XX";
};
+
+ bluetooth0: bluetooth@0,1 {
+ compatible = "pci14e4,5f71";
+ reg = <0x10100 0x0 0x0 0x0 0x0>;
+ /* To be filled by the loader */
+ local-bd-address = [00 00 00 00 00 00];
+ };
};
&port01 {
diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
index 95560bf3798bfebe133afafba674005a3e62ddcc..ed38acc0dfc36a1e30b1d44f1a8dcee089e87232 100644
--- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
@@ -11,6 +11,7 @@
/ {
aliases {
+ bluetooth0 = &bluetooth0;
serial0 = &serial0;
wifi0 = &wifi0;
};
@@ -90,6 +91,13 @@ wifi0: wifi@0,0 {
local-mac-address = [00 10 18 00 00 10];
apple,antenna-sku = "XX";
};
+
+ bluetooth0: bluetooth@0,1 {
+ compatible = "pci14e4,5f71";
+ reg = <0x10100 0x0 0x0 0x0 0x0>;
+ /* To be filled by the loader */
+ local-bd-address = [00 00 00 00 00 00];
+ };
};
&port01 {
--
2.50.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/5] dt-bindings: arm: apple: Add t8112 j415 compatible
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
` (2 preceding siblings ...)
2025-08-13 9:53 ` [PATCH 3/5] arm64: dts: apple: t600x: Add bluetooth device nodes Janne Grunau via B4 Relay
@ 2025-08-13 9:53 ` Janne Grunau via B4 Relay
2025-08-20 19:07 ` Rob Herring
2025-08-13 9:53 ` [PATCH 5/5] arm64: dts: apple: Add devicetreee for t8112-j415 Janne Grunau via B4 Relay
` (2 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Janne Grunau via B4 Relay @ 2025-08-13 9:53 UTC (permalink / raw)
To: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mark Kettenis, Hector Martin
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
From: Janne Grunau <j@jannau.net>
This adds the "apple,j415" (MacBook Air (15-inch, M2, 2023) to the
apple,t8112 platform.
Signed-off-by: Janne Grunau <j@jannau.net>
---
Documentation/devicetree/bindings/arm/apple.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml
index da60e9de1cfbd0151e973c3aafba6d0880fc21aa..3b90b5df60507b245de387de104a4e64f234139a 100644
--- a/Documentation/devicetree/bindings/arm/apple.yaml
+++ b/Documentation/devicetree/bindings/arm/apple.yaml
@@ -93,6 +93,7 @@ description: |
- MacBook Air (M2, 2022)
- MacBook Pro (13-inch, M2, 2022)
+ - MacBook Pro (15-inch, M2, 2023)
- Mac mini (M2, 2023)
And devices based on the "M1 Pro", "M1 Max" and "M1 Ultra" SoCs:
@@ -279,6 +280,7 @@ properties:
items:
- enum:
- apple,j413 # MacBook Air (M2, 2022)
+ - apple,j415 # MacBook Air (M2, 2023)
- apple,j473 # Mac mini (M2, 2023)
- apple,j493 # MacBook Pro (13-inch, M2, 2022)
- const: apple,t8112
--
2.50.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 4/5] dt-bindings: arm: apple: Add t8112 j415 compatible
2025-08-13 9:53 ` [PATCH 4/5] dt-bindings: arm: apple: Add t8112 j415 compatible Janne Grunau via B4 Relay
@ 2025-08-20 19:07 ` Rob Herring
2025-08-21 10:31 ` Janne Grunau
0 siblings, 1 reply; 12+ messages in thread
From: Rob Herring @ 2025-08-20 19:07 UTC (permalink / raw)
To: Janne Grunau
Cc: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Krzysztof Kozlowski,
Conor Dooley, Mark Kettenis, Hector Martin, asahi,
linux-arm-kernel, devicetree, linux-kernel
On Wed, Aug 13, 2025 at 11:53:36AM +0200, Janne Grunau wrote:
> This adds the "apple,j415" (MacBook Air (15-inch, M2, 2023) to the
> apple,t8112 platform.
>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
> Documentation/devicetree/bindings/arm/apple.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml
> index da60e9de1cfbd0151e973c3aafba6d0880fc21aa..3b90b5df60507b245de387de104a4e64f234139a 100644
> --- a/Documentation/devicetree/bindings/arm/apple.yaml
> +++ b/Documentation/devicetree/bindings/arm/apple.yaml
> @@ -93,6 +93,7 @@ description: |
>
> - MacBook Air (M2, 2022)
> - MacBook Pro (13-inch, M2, 2022)
> + - MacBook Pro (15-inch, M2, 2023)
s/Pro/Air/?
> - Mac mini (M2, 2023)
>
> And devices based on the "M1 Pro", "M1 Max" and "M1 Ultra" SoCs:
> @@ -279,6 +280,7 @@ properties:
> items:
> - enum:
> - apple,j413 # MacBook Air (M2, 2022)
> + - apple,j415 # MacBook Air (M2, 2023)
> - apple,j473 # Mac mini (M2, 2023)
> - apple,j493 # MacBook Pro (13-inch, M2, 2022)
> - const: apple,t8112
>
> --
> 2.50.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] dt-bindings: arm: apple: Add t8112 j415 compatible
2025-08-20 19:07 ` Rob Herring
@ 2025-08-21 10:31 ` Janne Grunau
0 siblings, 0 replies; 12+ messages in thread
From: Janne Grunau @ 2025-08-21 10:31 UTC (permalink / raw)
To: Rob Herring
Cc: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Krzysztof Kozlowski,
Conor Dooley, Mark Kettenis, Hector Martin, asahi,
linux-arm-kernel, devicetree, linux-kernel
On Wed, Aug 20, 2025 at 02:07:08PM -0500, Rob Herring wrote:
> On Wed, Aug 13, 2025 at 11:53:36AM +0200, Janne Grunau wrote:
> > This adds the "apple,j415" (MacBook Air (15-inch, M2, 2023) to the
> > apple,t8112 platform.
> >
> > Signed-off-by: Janne Grunau <j@jannau.net>
> > ---
> > Documentation/devicetree/bindings/arm/apple.yaml | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/arm/apple.yaml b/Documentation/devicetree/bindings/arm/apple.yaml
> > index da60e9de1cfbd0151e973c3aafba6d0880fc21aa..3b90b5df60507b245de387de104a4e64f234139a 100644
> > --- a/Documentation/devicetree/bindings/arm/apple.yaml
> > +++ b/Documentation/devicetree/bindings/arm/apple.yaml
> > @@ -93,6 +93,7 @@ description: |
> >
> > - MacBook Air (M2, 2022)
> > - MacBook Pro (13-inch, M2, 2022)
> > + - MacBook Pro (15-inch, M2, 2023)
>
> s/Pro/Air/?
yes, thanks. changed moved the added entry below "MacBook Air (M2, 2022)"
Janne
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 5/5] arm64: dts: apple: Add devicetreee for t8112-j415
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
` (3 preceding siblings ...)
2025-08-13 9:53 ` [PATCH 4/5] dt-bindings: arm: apple: Add t8112 j415 compatible Janne Grunau via B4 Relay
@ 2025-08-13 9:53 ` Janne Grunau via B4 Relay
2025-08-16 14:06 ` [PATCH 0/5] Apple device tree sync from downstream kernel Sven Peter
2025-08-19 18:38 ` Neal Gompa
6 siblings, 0 replies; 12+ messages in thread
From: Janne Grunau via B4 Relay @ 2025-08-13 9:53 UTC (permalink / raw)
To: Sven Peter, Alyssa Rosenzweig, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mark Kettenis, Hector Martin
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Janne Grunau
From: Janne Grunau <j@jannau.net>
The 15-inch M2 MacBook Air was released a year after the 13-inch one
thus missed in initial submission of devicetrees for M2 based devices.
It is currently a copy of t8112-j413 with edited identifiers but will
eventually differ in a meaningful way. It has for example a different
speaker configuration than the 13-inch model.
Signed-off-by: Janne Grunau <j@jannau.net>
---
arch/arm64/boot/dts/apple/Makefile | 1 +
arch/arm64/boot/dts/apple/t8112-j415.dts | 80 ++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile
index 4f337bff36cdf51837ac7d50122692895026ce14..df4ba8ef6213c9f7e4ef02a50d7250008977cc71 100644
--- a/arch/arm64/boot/dts/apple/Makefile
+++ b/arch/arm64/boot/dts/apple/Makefile
@@ -80,5 +80,6 @@ dtb-$(CONFIG_ARCH_APPLE) += t6001-j316c.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6001-j375c.dtb
dtb-$(CONFIG_ARCH_APPLE) += t6002-j375d.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb
+dtb-$(CONFIG_ARCH_APPLE) += t8112-j415.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
dtb-$(CONFIG_ARCH_APPLE) += t8112-j493.dtb
diff --git a/arch/arm64/boot/dts/apple/t8112-j415.dts b/arch/arm64/boot/dts/apple/t8112-j415.dts
new file mode 100644
index 0000000000000000000000000000000000000000..b54e218e5384ca89155e4350d6680a28a531f408
--- /dev/null
+++ b/arch/arm64/boot/dts/apple/t8112-j415.dts
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Apple MacBook Air (15-inch, M2, 2023)
+ *
+ * target-type: J415
+ *
+ * Copyright The Asahi Linux Contributors
+ */
+
+/dts-v1/;
+
+#include "t8112.dtsi"
+#include "t8112-jxxx.dtsi"
+#include <dt-bindings/leds/common.h>
+
+/ {
+ compatible = "apple,j415", "apple,t8112", "apple,arm-platform";
+ model = "Apple MacBook Air (15-inch, M2, 2023)";
+
+ aliases {
+ bluetooth0 = &bluetooth0;
+ wifi0 = &wifi0;
+ };
+
+ led-controller {
+ compatible = "pwm-leds";
+ led-0 {
+ pwms = <&fpwm1 0 40000>;
+ label = "kbd_backlight";
+ function = LED_FUNCTION_KBD_BACKLIGHT;
+ color = <LED_COLOR_ID_WHITE>;
+ max-brightness = <255>;
+ default-state = "keep";
+ };
+ };
+};
+
+/*
+ * Force the bus number assignments so that we can declare some of the
+ * on-board devices and properties that are populated by the bootloader
+ * (such as MAC addresses).
+ */
+&port00 {
+ bus-range = <1 1>;
+ wifi0: wifi@0,0 {
+ compatible = "pci14e4,4433";
+ reg = <0x10000 0x0 0x0 0x0 0x0>;
+ /* To be filled by the loader */
+ local-mac-address = [00 10 18 00 00 10];
+ apple,antenna-sku = "XX";
+ brcm,board-type = "apple,snake";
+ };
+
+ bluetooth0: bluetooth@0,1 {
+ compatible = "pci14e4,5f71";
+ reg = <0x10100 0x0 0x0 0x0 0x0>;
+ /* To be filled by the loader */
+ local-bd-address = [00 00 00 00 00 00];
+ brcm,board-type = "apple,snake";
+ };
+};
+
+&i2c0 {
+ /* MagSafe port */
+ hpm5: usb-pd@3a {
+ compatible = "apple,cd321x";
+ reg = <0x3a>;
+ interrupt-parent = <&pinctrl_ap>;
+ interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "irq";
+ };
+};
+
+&i2c4 {
+ status = "okay";
+};
+
+&fpwm1 {
+ status = "okay";
+};
--
2.50.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Apple device tree sync from downstream kernel
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
` (4 preceding siblings ...)
2025-08-13 9:53 ` [PATCH 5/5] arm64: dts: apple: Add devicetreee for t8112-j415 Janne Grunau via B4 Relay
@ 2025-08-16 14:06 ` Sven Peter
2025-08-19 18:38 ` Neal Gompa
6 siblings, 0 replies; 12+ messages in thread
From: Sven Peter @ 2025-08-16 14:06 UTC (permalink / raw)
To: j, Alyssa Rosenzweig, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Mark Kettenis, Hector Martin
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel
On 13.08.25 11:53, Janne Grunau via B4 Relay wrote:
> This series pulls changes from the downstream device trees which are
> supported in upstream kernel.
> Most importantly it fixes the PCIe description for a specific iMac model
> (iMac M1, 2 USB-C ports, 2021). This is worked around in the downstream
> kernel by not disabling the port. In preparation for submitting M2
> Pro/Max/Ultra devices trees I investigated the issue on the similarly
> affected M2 Pro Mac mini and fixed it this way.
> It completes the Wlan/BT device nodes for t600x based devices and adds
> the missing 15-inch Macbook Air (M2, 2023).
>
> Checkpatch emits following warnings:
>
> WARNING: DT compatible string vendor "pci14e4" appears un-documented --
> check ./Documentation/devicetree/bindings/vendor-prefixes.yaml
>
> Which I chose to ignore. `vendor-prefixes.yaml` prefixes contains no
> other mapping for PCI vendor code and the list of ignored prefixes
> forbids extending it. Both options feel wrong though. "pci${vendor}" is
> clearly a vendor prefix but duplicating the PCI vendor data base feels
> wrong. `vendor-prefixes.yaml` currently does not contain and PCI vendor
> aliases.
>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
For the entire series:
Reviewed-by: Sven Peter <sven@kernel.org>
Thanks,
Sven
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/5] Apple device tree sync from downstream kernel
2025-08-13 9:53 [PATCH 0/5] Apple device tree sync from downstream kernel Janne Grunau via B4 Relay
` (5 preceding siblings ...)
2025-08-16 14:06 ` [PATCH 0/5] Apple device tree sync from downstream kernel Sven Peter
@ 2025-08-19 18:38 ` Neal Gompa
6 siblings, 0 replies; 12+ messages in thread
From: Neal Gompa @ 2025-08-19 18:38 UTC (permalink / raw)
To: j
Cc: Sven Peter, Alyssa Rosenzweig, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Mark Kettenis, Hector Martin, asahi,
linux-arm-kernel, devicetree, linux-kernel
On Wed, Aug 13, 2025 at 5:53 AM Janne Grunau via B4 Relay
<devnull+j.jannau.net@kernel.org> wrote:
>
> This series pulls changes from the downstream device trees which are
> supported in upstream kernel.
> Most importantly it fixes the PCIe description for a specific iMac model
> (iMac M1, 2 USB-C ports, 2021). This is worked around in the downstream
> kernel by not disabling the port. In preparation for submitting M2
> Pro/Max/Ultra devices trees I investigated the issue on the similarly
> affected M2 Pro Mac mini and fixed it this way.
> It completes the Wlan/BT device nodes for t600x based devices and adds
> the missing 15-inch Macbook Air (M2, 2023).
>
> Checkpatch emits following warnings:
>
> WARNING: DT compatible string vendor "pci14e4" appears un-documented --
> check ./Documentation/devicetree/bindings/vendor-prefixes.yaml
>
> Which I chose to ignore. `vendor-prefixes.yaml` prefixes contains no
> other mapping for PCI vendor code and the list of ignored prefixes
> forbids extending it. Both options feel wrong though. "pci${vendor}" is
> clearly a vendor prefix but duplicating the PCI vendor data base feels
> wrong. `vendor-prefixes.yaml` currently does not contain and PCI vendor
> aliases.
>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
> Hector Martin (2):
> arm64: dts: apple: t600x: Comple WiFi properties
> arm64: dts: apple: t600x: Add bluetooth device nodes
>
> Janne Grunau (3):
> arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map
> dt-bindings: arm: apple: Add t8112 j415 compatible
> arm64: dts: apple: Add devicetreee for t8112-j415
>
> Documentation/devicetree/bindings/arm/apple.yaml | 2 +
> arch/arm64/boot/dts/apple/Makefile | 1 +
> arch/arm64/boot/dts/apple/t6000-j314s.dts | 8 +++
> arch/arm64/boot/dts/apple/t6000-j316s.dts | 8 +++
> arch/arm64/boot/dts/apple/t6001-j314c.dts | 8 +++
> arch/arm64/boot/dts/apple/t6001-j316c.dts | 8 +++
> arch/arm64/boot/dts/apple/t6001-j375c.dts | 8 +++
> arch/arm64/boot/dts/apple/t6002-j375d.dts | 8 +++
> arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 10 +++
> arch/arm64/boot/dts/apple/t600x-j375.dtsi | 10 +++
> arch/arm64/boot/dts/apple/t8103-j457.dts | 12 +++-
> arch/arm64/boot/dts/apple/t8112-j415.dts | 80 ++++++++++++++++++++++++
> 12 files changed, 161 insertions(+), 2 deletions(-)
> ---
> base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585
> change-id: 20250813-apple-dt-sync-6-17-d1fc1c89f7ca
>
Series LGTM.
Reviewed-by: Neal Gompa <neal@gompa.dev>
--
真実はいつも一つ！/ Always, there's only one truth!
^ permalink raw reply [flat|nested] 12+ messages in thread