[PATCH v2 0/5] Apple device tree sync from downstream kernel

Janne Grunau posted 5 patches 1 month, 1 week ago
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(-)
[PATCH v2 0/5] Apple device tree sync from downstream kernel
Posted by Janne Grunau 1 month, 1 week ago
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>
---
Changes in v2:
- fixed commit subject of PATCH 2/5
- correct Macbook Pro (15-inch, M2) to Macbook Air
- added Neal's and Sven's Rb: tags
- Link to v1: https://lore.kernel.org/r/20250813-apple-dt-sync-6-17-v1-0-209f15d10aa0@jannau.net

---
Hector Martin (2):
      arm64: dts: apple: t600x: Add missing 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

Best regards,
-- 
Janne Grunau <j@jannau.net>
Re: [PATCH v2 0/5] Apple device tree sync from downstream kernel
Posted by Sven Peter 1 month ago
On Sat, 23 Aug 2025 11:49:43 +0200, Janne Grunau 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).
> 
> [...]

Applied to git@github.com:AsahiLinux/linux.git (apple-soc/dt-6.18), thanks!

[1/5] arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map
      https://github.com/AsahiLinux/linux/commit/6e08cdd604ed
[2/5] arm64: dts: apple: t600x: Add missing WiFi properties
      https://github.com/AsahiLinux/linux/commit/3050713d84f5
[3/5] arm64: dts: apple: t600x: Add bluetooth device nodes
      https://github.com/AsahiLinux/linux/commit/c34e2ec6a84e
[4/5] dt-bindings: arm: apple: Add t8112 j415 compatible
      https://github.com/AsahiLinux/linux/commit/efad8eaf6f2f
[5/5] arm64: dts: apple: Add devicetreee for t8112-j415
      https://github.com/AsahiLinux/linux/commit/273be31e5afd

Best regards,
-- 
Sven Peter <sven@kernel.org>
Re: [PATCH v2 0/5] Apple device tree sync from downstream kernel
Posted by Neal Gompa 1 month ago
On Sat, Aug 23, 2025 at 5:49 AM Janne Grunau <j@jannau.net> 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>
> ---
> Changes in v2:
> - fixed commit subject of PATCH 2/5
> - correct Macbook Pro (15-inch, M2) to Macbook Air
> - added Neal's and Sven's Rb: tags
> - Link to v1: https://lore.kernel.org/r/20250813-apple-dt-sync-6-17-v1-0-209f15d10aa0@jannau.net
>
> ---
> Hector Martin (2):
>       arm64: dts: apple: t600x: Add missing 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
>

LGTM.

Reviewed-by: Neal Gompa <neal@gompa.dev>


-- 
真実はいつも一つ!/ Always, there's only one truth!