Unverified Commit 8de446fd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'apple-soc-dt-6.18-part2' of... 

Merge tag 'apple-soc-dt-6.18-part2' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux into soc/dt

Apple SoC DTS updates for 6.18, part 2

- New device trees for all M2 Pro, Max and Ultra models are added.
  This is responsible for most of the changed lines since we already
  need 2000+ lines just to describe all the power domains inside
  t602x-pmgr.dtsi for these SoCs.
- Missing WiFi properties for t600x are added.
- Bluetooth nodes are added for all t600x machines.
- The PCIe ethernet iommu-map was fixed for the Apple M1 iMac
  to account for a disabled PCIe port.
- SPMI, NVMe, SART and mailbox nodes for Apple's T2 and A11.

* tag 'apple-soc-dt-6.18-part2' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux

:
  arm64: dts: apple: t8015: Add SPMI node
  arm64: dts: apple: t8012: Add SPMI node
  arm64: dts: apple: Add J180d (Mac Pro, M2 Ultra, 2023) device tree
  arm64: dts: apple: Add J474s, J475c and J475d device trees
  arm64: dts: apple: Add J414 and J416 Macbook Pro device trees
  arm64: dts: apple: Add initial t6020/t6021/t6022 DTs
  arm64: dts: apple: Add ethernet0 alias for J375 template
  dt-bindings: arm: apple: Add t6020x compatibles
  arm64: dts: apple: t8015: Add NVMe nodes
  arm64: dts: apple: t8015: Fix PCIE power domains dependencies
  arm64: dts: apple: Add devicetreee for t8112-j415
  dt-bindings: arm: apple: Add t8112 j415 compatible
  arm64: dts: apple: t600x: Add bluetooth device nodes
  arm64: dts: apple: t600x: Add missing WiFi properties
  arm64: dts: apple: t8103-j457: Fix PCIe ethernet iommu-map

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 26116b98 70fa521f

Documentation/devicetree/bindings/arm/apple.yaml

+40 −1
Original line number Diff line number Diff line
@@ -92,10 +92,11 @@ description: | 
  Devices based on the "M2" SoC:



  - MacBook Air (M2, 2022)

  - MacBook Air (15-inch, M2, 2023)

  - MacBook Pro (13-inch, M2, 2022)

  - Mac mini (M2, 2023)



  And devices based on the "M1 Pro", "M1 Max" and "M1 Ultra" SoCs:

  Devices based on the "M1 Pro", "M1 Max" and "M1 Ultra" SoCs:



  - MacBook Pro (14-inch, M1 Pro, 2021)

  - MacBook Pro (14-inch, M1 Max, 2021)
@@ -104,6 +105,17 @@ description: | 
  - Mac Studio (M1 Max, 2022)

  - Mac Studio (M1 Ultra, 2022)



  Devices based on the "M2 Pro", "M2 Max" and "M2 Ultra" SoCs:



  - MacBook Pro (14-inch, M2 Pro, 2023)

  - MacBook Pro (14-inch, M2 Max, 2023)

  - MacBook Pro (16-inch, M2 Pro, 2023)

  - MacBook Pro (16-inch, M2 Max, 2023)

  - Mac mini (M2 Pro, 2023)

  - Mac Studio (M2 Max, 2023)

  - Mac Studio (M2 Ultra, 2023)

  - Mac Pro (M2 Ultra, 2023)



  The compatible property should follow this format:



  compatible = "apple,<targettype>", "apple,<socid>", "apple,arm-platform";
@@ -279,6 +291,7 @@ properties: 
        items:

          - enum:

              - apple,j413 # MacBook Air (M2, 2022)

              - apple,j415 # MacBook Air (15-inch, M2, 2023)

              - apple,j473 # Mac mini (M2, 2023)

              - apple,j493 # MacBook Pro (13-inch, M2, 2022)

          - const: apple,t8112
@@ -308,6 +321,32 @@ properties: 
          - const: apple,t6002

          - const: apple,arm-platform



      - description: Apple M2 Pro SoC based platforms

        items:

          - enum:

              - apple,j414s # MacBook Pro (14-inch, M2 Pro, 2023)

              - apple,j416s # MacBook Pro (16-inch, M2 Pro, 2023)

              - apple,j474s # Mac mini (M2 Pro, 2023)

          - const: apple,t6020

          - const: apple,arm-platform



      - description: Apple M2 Max SoC based platforms

        items:

          - enum:

              - apple,j414c # MacBook Pro (14-inch, M2 Max, 2023)

              - apple,j416c # MacBook Pro (16-inch, M2 Max, 2023)

              - apple,j475c # Mac Studio (M2 Max, 2023)

          - const: apple,t6021

          - const: apple,arm-platform



      - description: Apple M2 Ultra SoC based platforms

        items:

          - enum:

              - apple,j180d # Mac Pro (M2 Ultra, 2023)

              - apple,j475d # Mac Studio (M2 Ultra, 2023)

          - const: apple,t6022

          - const: apple,arm-platform



additionalProperties: true



...

arch/arm64/boot/dts/apple/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -79,6 +79,15 @@ dtb-$(CONFIG_ARCH_APPLE) += t6000-j316s.dtb 
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) += t6022-j180d.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6020-j414s.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6021-j414c.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6020-j416s.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6021-j416c.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6020-j474s.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6021-j475c.dtb

dtb-$(CONFIG_ARCH_APPLE) += t6022-j475d.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

arch/arm64/boot/dts/apple/t6000-j314s.dts

+8 −0
Original line number Diff line number Diff line
@@ -16,3 +16,11 @@ / { 
	compatible = "apple,j314s", "apple,t6000", "apple,arm-platform";

	model = "Apple MacBook Pro (14-inch, M1 Pro, 2021)";

};



&wifi0 {

	brcm,board-type = "apple,maldives";

};



&bluetooth0 {

	brcm,board-type = "apple,maldives";

};

arch/arm64/boot/dts/apple/t6000-j316s.dts

+8 −0
Original line number Diff line number Diff line
@@ -16,3 +16,11 @@ / { 
	compatible = "apple,j316s", "apple,t6000", "apple,arm-platform";

	model = "Apple MacBook Pro (16-inch, M1 Pro, 2021)";

};



&wifi0 {

	brcm,board-type = "apple,madagascar";

};



&bluetooth0 {

	brcm,board-type = "apple,madagascar";

};

arch/arm64/boot/dts/apple/t6001-j314c.dts

+8 −0
Original line number Diff line number Diff line
@@ -16,3 +16,11 @@ / { 
	compatible = "apple,j314c", "apple,t6001", "apple,arm-platform";

	model = "Apple MacBook Pro (14-inch, M1 Max, 2021)";

};



&wifi0 {

	brcm,board-type = "apple,maldives";

};



&bluetooth0 {

	brcm,board-type = "apple,maldives";

};