Unverified Commit 5f424ff2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Apple SoC DT updates for 5.17, round 2:

- Various cleanups (removing useless props, sorting nodes, renaming
  things)
- Add PMGR min-state binding & props (see PMGR pull for driver change)
- Initial compatibles for t600x machines (M1 Pro/Max). This covers the
  bindings that just need compatible bumps & minor tweaks, no driver
  changes.
- Add watchdog node (driver not merged yet, hopefully will be; binding
  went in the previous pull)
- Add missing power-domains property to the mailbox binding

* tag 'asahi-soc-dt-5.17-v2' of https://github.com/AsahiLinux/linux:
  dt-bindings: mailbox: apple,mailbox: Add power-domains property
  arm64: dts: apple: t8103: Sort nodes by address
  arm64: dts: apple: t8103: Rename clk24 to clkref
  arm64: dts: apple: t8103: Add watchdog node
  dt-bindings: pinctrl: apple,pinctrl: Add apple,t6000-pinctrl compatible
  dt-bindings: pci: apple,pcie: Add t6000 support
  dt-bindings: i2c: apple,i2c: Add apple,t6000-i2c compatible
  dt-bindings: arm: apple: Add t6000/t6001 MacBook Pro 14/16" compatibles
  arm64: dts: apple: t8103: Add apple,min-state to DCP PMGR nodes
  dt-bindings: power: apple,pmgr-pwrstate: Add apple,min-state prop
  arm64: dts: apple: t8103: Remove PCIe max-link-speed properties

Link: https://lore.kernel.org/r/a24faafd-f2ae-c3a7-5327-b27da7d9e34b@marcan.st


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 03e9474b 301f6516

Documentation/devicetree/bindings/arm/apple.yaml

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

  - iMac (24-inch, M1, 2021)



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



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

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

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

  - MacBook Pro (16-inch, M1 Max, 2021)



  The compatible property should follow this format:



  compatible = "apple,<targettype>", "apple,<socid>", "apple,arm-platform";
@@ -60,6 +67,20 @@ properties: 
              - apple,j457 # iMac (24-inch, 2x USB-C, M1, 2021)

          - const: apple,t8103

          - const: apple,arm-platform

      - description: Apple M1 Pro SoC based platforms

        items:

          - enum:

              - apple,j314s # MacBook Pro (14-inch, M1 Pro, 2021)

              - apple,j316s # MacBook Pro (16-inch, M1 Pro, 2021)

          - const: apple,t6000

          - const: apple,arm-platform

      - description: Apple M1 Max SoC based platforms

        items:

          - enum:

              - apple,j314c # MacBook Pro (14-inch, M1 Max, 2021)

              - apple,j316c # MacBook Pro (16-inch, M1 Max, 2021)

          - const: apple,t6001

          - const: apple,arm-platform



additionalProperties: true

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

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ allOf: 
properties:

  compatible:

    items:

      - const: apple,t8103-i2c

      - enum:

          - apple,t8103-i2c

          - apple,t6000-i2c

      - const: apple,i2c



  reg:

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

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ properties: 
  "#mbox-cells":

    const: 0



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/pci/apple,pcie.yaml

+21 −7
Original line number Diff line number Diff line
@@ -28,19 +28,17 @@ description: | 
  distributed over the root ports as the OS sees fit by programming

  the PCIe controller's port registers.



allOf:

  - $ref: /schemas/pci/pci-bus.yaml#

  - $ref: /schemas/interrupt-controller/msi-controller.yaml#



properties:

  compatible:

    items:

      - const: apple,t8103-pcie

      - enum:

          - apple,t8103-pcie

          - apple,t6000-pcie

      - const: apple,pcie



  reg:

    minItems: 3

    maxItems: 5

    maxItems: 6



  reg-names:

    minItems: 3
@@ -50,6 +48,7 @@ properties: 
      - const: port0

      - const: port1

      - const: port2

      - const: port3



  ranges:

    minItems: 2
@@ -59,7 +58,7 @@ properties: 
    description:

      Interrupt specifiers, one for each root port.

    minItems: 1

    maxItems: 3

    maxItems: 4



  msi-parent: true
@@ -81,6 +80,21 @@ required: 


unevaluatedProperties: false



allOf:

  - $ref: /schemas/pci/pci-bus.yaml#

  - $ref: /schemas/interrupt-controller/msi-controller.yaml#

  - if:

      properties:

        compatible:

          contains:

            const: apple,t8103-pcie

    then:

      properties:

        reg:

          maxItems: 5

        interrupts:

          maxItems: 3



examples:

  - |

    #include <dt-bindings/interrupt-controller/apple-aic.h>

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

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ description: | 
properties:

  compatible:

    items:

      - const: apple,t8103-pinctrl

      - enum:

          - apple,t8103-pinctrl

          - apple,t6000-pinctrl

      - const: apple,pinctrl



  reg: