Commit 0f048c87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-dt-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC dt updates from Arnd Bergmann:
 "There are five sets of new SoCs that get added in existing families,
  all of them being either upgrades or cut-down versions of the older
  chips:

   - Apple M2 Pro, M2 Max and M2 Ultra, used in the 2022/2023 generation
     of high-end workstations and laptops from Apple. Linux has been
     working on these for a while but stil requires patches.

   - Axis Artpec8 is an Armv8 chip based on Samsung Exynos design,
     unlike the earlier Armv7 Artpec6 from the same company that was
     part of a separate family of chips.

   - NXP i.MX91 is a cut-down version of i.MX93, using only a single
     Cortex-A55 core.

   - Qualcomm Lemans Auto is a variant of the Lemans SoC that was
     originally merged under the sa8775p name, the differences being
     mostly the firmware configuration of the platform.

   - Four new Renesas SoCs RZ/T2H (r9a09g077m44), RZ/N2H (r9a09g087m44),
     RZ/T2H (r9a09g077), and RZ/N2H (r9a09g087) are all industrial
     bedded SoCs based on Cortex-A55 cores

  In total, there are 65 new machines, including:

   - Industrial embedded system and single-board computers based on NXP,
     Allwinner, TI, Rockchips, Marvell, Xilinx Spacemit, Starfive chips.

   - Reference boards for the newly added Renesas, Qualcomm, NXP and
     Axis ARMv8 chips as well as Microchip's MPFS RISC-V SoC

   - Laptops and Workstations using Apple M2 and Qualcomm Snapdragon X1
     chips.

   - Several Samsung phones using Qualcomm Snapdragon chips

   - Set-top boxes based on Allwinner H313

   - Five BMC boards using 32-bit ASpeed SoCs

   - Three network routers using IXP4xx (ARMv5!) and Broadcom bcm4708
     (ARMv7) SoCs

  Two machines get phased out because they were available only in small
  quantities but never made it into products: one STi407 based reference
  board, and a Snapdragon 845 based Chromebook.

  Aside from the newly added machines, a lot of work went into improving
  hardware support on the existing machines and cleaning up contents for
  validation"

* tag 'soc-dt-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (931 commits)
  arm64: dts: apm-shadowcat: Drop "apm,xgene2-pcie" compatible
  arm64: dts: apm-shadowcat: Move slimpro nodes out of "simple-bus" node
  ARM: dts: microchip: sam9x7: Add qspi controller
  arm64: dts: qcom: Add MST pixel streams for displayport
  arm64: dts: qcom: sm6350: correct DP compatibility strings
  arm64: dts: qcom: monaco-evk: Enable Adreno 623 GPU
  arm64: dts: qcom: qcs8300-ride: Enable Adreno 623 GPU
  arm64: dts: qcom: qcs8300: Add gpu and gmu nodes
  arm64: dts: allwinner: h313: Add Amediatech X96Q
  dt-bindings: arm: sunxi: Add Amediatech X96Q
  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: rockchip: Add devicetree for the ROC-RK3588-RT
  dt-bindings: arm: rockchip: Add Firefly ROC-RK3588-RT
  arm64: dts: rockchip: update pinctrl names for Radxa E52C
  arm64: dts: rockchip: remove vcc_3v3_pmu regulator for Radxa E52C
  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
  ...
parents a8253f80 8c0650e0

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



...

Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ properties: 
              - facebook,yamp-bmc

              - facebook,yosemitev2-bmc

              - facebook,wedge400-bmc

              - facebook,wedge400-data64-bmc

              - hxt,stardragon4800-rep2-bmc

              - ibm,mihawk-bmc

              - ibm,mowgli-bmc
@@ -81,9 +82,12 @@ properties: 
              - asus,x4tf-bmc

              - facebook,bletchley-bmc

              - facebook,catalina-bmc

              - facebook,clemente-bmc

              - facebook,cloudripper-bmc

              - facebook,darwin-bmc

              - facebook,elbert-bmc

              - facebook,fuji-bmc

              - facebook,fuji-data64-bmc

              - facebook,greatlakes-bmc

              - facebook,harma-bmc

              - facebook,minerva-cmc

Documentation/devicetree/bindings/arm/axis.txt

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
Axis Communications AB

ARTPEC series SoC Device Tree Bindings



ARTPEC-6 ARM SoC

================



Required root node properties:

- compatible = "axis,artpec6";



ARTPEC-6 Development board:

---------------------------

Required root node properties:

- compatible = "axis,artpec6-dev-board", "axis,artpec6";

Documentation/devicetree/bindings/arm/axis.yaml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/axis.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Axis ARTPEC platforms



maintainers:

  - Jesper Nilsson <jesper.nilsson@axis.com>

  - Lars Persson <lars.persson@axis.com>

  - linux-arm-kernel@axis.com



description: |

  ARM platforms using SoCs designed by Axis branded as "ARTPEC".



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: Axis ARTPEC-6 SoC board

        items:

          - enum:

              - axis,artpec6-dev-board

          - const: axis,artpec6



      - description: Axis ARTPEC-8 SoC board

        items:

          - enum:

              - axis,artpec8-grizzly

          - const: axis,artpec8



additionalProperties: true



...

Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml

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

              - asus,rt-ac56u

              - asus,rt-ac68u

              - buffalo,wxr-1750dhp

              - buffalo,wzr-1166dhp

              - buffalo,wzr-1166dhp2

              - buffalo,wzr-1750dhp