[RFC PATCH 00/10] Apple M1 Pro/Max/Ultra device trees

Janne Grunau j at jannau.net
Fri Sep 9 06:50:53 PDT 2022


Hej,

this series contains device trees for Apple's M1 Pro, Max and Ultra SoCs
and devices based on these SoCs.

Quoting from the main commit:

These SoCs are found in Apple devices with M1 Pro (t6000), M1 Max
(t6001) and M1 Ultra (t6002).

t6000 is a cut-down version of t6001, so the former just includes the
latter and disables the missing bits (This is currently just one PMGR
node and all of its domains.

t6002 is two connected t6001 dies. The implementation seems to use
t6001 with blocks disabled (mostly on the second die). MMIO addresses on
the second die have a constant offset. The interrupt controller is
multi-die aware. This setup can be represented in the device tree with
two top level "soc" nodes. The MMIO offset is applied via "ranges" and
devices are included with preproceesor macros to make the node labels
unique and to specify the die number for the interrupt definition.

Device nodes are distributed over dtsi files based on whether they are
present on both dies or just on the first die. The only execption is the
NVMe controller which resides on the second die. Its nodes are in a
separate file.

I'm open for ideas how to improve the preprocessor handling but I'm
convinced that it should be avoided to duplicate the device nodes
manually.

For dts verification this series depends on t6000-dart support
(https://lore.kernel.org/linux-iommu/20220901012519.7167-1-j@jannau.net/T/#t)
expected to be queued for v6.1.

Even with the t6000-dart support t600x devices are not terribly useful
in upstream. There is no input device support. The laptop's keyboard
and touchpad are missing SPI and HID over SPI drivers. The dwc3
USB-C ports are not yet added since they require special handling
after disconnect. The PCIe based USB xhci controller in the Mac Studio
requires firmware downloaded in a similar way as USB_XHCI_PCI_RENESAS.

For dependency handling this series contains a fix for the aic
dt-bindings and carries mostly identical device tree additions for M1
and M1 Pro/Max/Ultra as part of audio support.

The series passes dtbs_check with 2 additional bindings already
submitted elsewhere:
- "ASoC: Add Apple MCA I2S transceiver bindings" (6ed462d1c11675)
  in sound/for-next
- "dt-bindings: iommu: dart: add t6000 compatible"
  https://lore.kernel.org/linux-iommu/20220901012519.7167-2-j@jannau.net/

New bindings passes dt_binding_check


Hector Martin (3):
  arm64: dts: apple: Fix j45x model years
  arm64: dts: apple: Add initial t6000/t6001/t6002 DTs
  arm64: dts: apple: Add J314 and J316 devicetrees

Janne Grunau (6):
  dt-bindings: apple,aic: Fix required item "apple,fiq-index" in
    affinity description
  dt-bindings: dma: apple,admac: Add iommus and power-domains properties
  dt-bindings: apple,aic2: Add CPU PMU per-cpu pseudo-interrupts
  dt-bindings: arm: apple: Add t6001/t6002 Mac Studio compatibles
  arm64: dts: apple: Add J375 devicetrees
  arm64: dts: apple: t600x: Add MCA and its support

Martin Povišer (1):
  arm64: dts: apple: t8103: Add MCA and its support

 .../devicetree/bindings/arm/apple.yaml        |   11 +-
 .../devicetree/bindings/dma/apple,admac.yaml  |    7 +
 .../interrupt-controller/apple,aic.yaml       |    2 +-
 .../interrupt-controller/apple,aic2.yaml      |   29 +
 arch/arm64/boot/dts/apple/Makefile            |    6 +
 arch/arm64/boot/dts/apple/multi-die-cpp.h     |   23 +
 arch/arm64/boot/dts/apple/t6000-j314s.dts     |   18 +
 arch/arm64/boot/dts/apple/t6000-j316s.dts     |   18 +
 arch/arm64/boot/dts/apple/t6000.dtsi          |   18 +
 arch/arm64/boot/dts/apple/t6001-j314c.dts     |   18 +
 arch/arm64/boot/dts/apple/t6001-j316c.dts     |   18 +
 arch/arm64/boot/dts/apple/t6001-j375c.dts     |   18 +
 arch/arm64/boot/dts/apple/t6001.dtsi          |   63 +
 arch/arm64/boot/dts/apple/t6002-j375d.dts     |   50 +
 arch/arm64/boot/dts/apple/t6002.dtsi          |  173 ++
 arch/arm64/boot/dts/apple/t600x-common.dtsi   |  137 ++
 arch/arm64/boot/dts/apple/t600x-die0.dtsi     |  360 +++
 arch/arm64/boot/dts/apple/t600x-dieX.dtsi     |  103 +
 .../arm64/boot/dts/apple/t600x-gpio-pins.dtsi |   45 +
 .../arm64/boot/dts/apple/t600x-j314-j316.dtsi |  114 +
 arch/arm64/boot/dts/apple/t600x-j375.dtsi     |  119 +
 arch/arm64/boot/dts/apple/t600x-nvme.dtsi     |   42 +
 arch/arm64/boot/dts/apple/t600x-pmgr.dtsi     | 2012 +++++++++++++++++
 arch/arm64/boot/dts/apple/t8103-j456.dts      |    2 +-
 arch/arm64/boot/dts/apple/t8103-j457.dts      |    2 +-
 arch/arm64/boot/dts/apple/t8103-jxxx.dtsi     |    4 +
 arch/arm64/boot/dts/apple/t8103.dtsi          |   73 +
 27 files changed, 3481 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm64/boot/dts/apple/multi-die-cpp.h
 create mode 100644 arch/arm64/boot/dts/apple/t6000-j314s.dts
 create mode 100644 arch/arm64/boot/dts/apple/t6000-j316s.dts
 create mode 100644 arch/arm64/boot/dts/apple/t6000.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t6001-j314c.dts
 create mode 100644 arch/arm64/boot/dts/apple/t6001-j316c.dts
 create mode 100644 arch/arm64/boot/dts/apple/t6001-j375c.dts
 create mode 100644 arch/arm64/boot/dts/apple/t6001.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t6002-j375d.dts
 create mode 100644 arch/arm64/boot/dts/apple/t6002.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-common.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-die0.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-dieX.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-j375.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-nvme.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t600x-pmgr.dtsi

-- 
2.35.1




More information about the linux-arm-kernel mailing list