Unverified Commit 295954fe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'asahi-soc-dt-6.4' of https://github.com/AsahiLinux/linux into soc/dt 

Apple SoC DT updates for 6.4.

This time we have the M2 (t8112) device trees and compatible updates,
as well as a minor fix for PCIe ports on the prior models.

* tag 'asahi-soc-dt-6.4' of https://github.com/AsahiLinux/linux:
  arm64: dts: apple: t600x: Disable unused PCIe ports
  arm64: dts: apple: t8103: Disable unused PCIe ports
  arm64: dts: apple: t8112: Initial t8112 (M2) device trees
  dt-bindings: arm: apple: Add t8112 j413/j473/j493 compatibles
  dt-bindings: clock: apple,nco: Add t8112-nco compatible
  dt-bindings: i2c: apple,i2c: Add apple,t8112-i2c compatible
  dt-bindings: pinctrl: apple,pinctrl: Add apple,t8112-pinctrl compatible
  dt-bindings: pci: apple,pcie: Add t8112 support
  dt-bindings: nvme: apple: Add apple,t8112-nvme-ans2 compatible string
  dt-bindings: mailbox: apple,mailbox: Add t8112 compatibles
  dt-bindings: iommu: apple,sart: Add apple,t8112-sart compatible string
  dt-bindings: interrupt-controller: apple,aic2: Add apple,t8112-aic compatible
  dt-bindings: arm: cpus: Add apple,avalanche & blizzard compatibles
  dt-bindings: watchdog: apple,wdt: Add t8112-wdt compatible
  dt-bindings: arm: apple: apple,pmgr: Add t8112-pmgr compatible
  dt-bindings: power: apple,pmgr-pwrstate: Add t8112 compatible

Link: https://lore.kernel.org/r/7263df01-aebc-2db5-f074-4805e0ae9fbc@marcan.st


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cfb6bb38 8d59efc3

Documentation/devicetree/bindings/arm/apple.yaml

+15 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ description: | 
  - MacBook Air (M1, 2020)

  - iMac (24-inch, M1, 2021)



  Devices based on the "M2" SoC:



  - MacBook Air (M2, 2022)

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

  - Mac mini (M2, 2023)



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



  - MacBook Pro (14-inch, M1 Pro, 2021)
@@ -70,6 +76,15 @@ properties: 
          - const: apple,t8103

          - const: apple,arm-platform



      - description: Apple M2 SoC based platforms

        items:

          - enum:

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

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

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

          - const: apple,t8112

          - const: apple,arm-platform



      - description: Apple M1 Pro SoC based platforms

        items:

          - enum:

Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
    items:

      - enum:

          - apple,t8103-pmgr

          - apple,t8112-pmgr

          - apple,t6000-pmgr

      - const: apple,pmgr

      - const: syscon

Documentation/devicetree/bindings/arm/cpus.yaml

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ properties: 


  compatible:

    enum:

      - apple,avalanche

      - apple,blizzard

      - apple,icestorm

      - apple,firestorm

      - arm,arm710t

Documentation/devicetree/bindings/clock/apple,nco.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - enum:

          - apple,t6000-nco

          - apple,t8103-nco

          - apple,t8112-nco

      - const: apple,nco



  clocks:

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
    items:

      - enum:

          - apple,t8103-i2c

          - apple,t8112-i2c

          - apple,t6000-i2c

      - const: apple,i2c