Commit e533cda1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM Devicetree updates from Olof Johansson:
 "As usual, most of the changes are to devicetrees.

  Besides smaller fixes, some refactorings and cleanups, some of the new
  platforms and chips (or significant features) supported are below:

  Broadcom boards:
   - Cisco Meraki MR32 (BCM53016-based)
   - BCM2711 (RPi4) display pipeline support

  Actions Semi boards:
   - Caninos Loucos Labrador SBC (S500-based)
   - RoseapplePi SBC (S500-based)

  Allwinner SoCs/boards:
   - A100 SoC with Perf1 board
   - Mali, DMA, Cetrus and IR support for R40 SoC

  Amlogic boards:
   - Libretch S905x CC V2 board
   - Hardkernel ODROID-N2+ board

  Aspeed boards/platforms:
   - Wistron Mowgli (AST2500-based, Power9 OpenPower server)
   - Facebook Wedge400 (AST2500-based, ToR switch)

  Hisilicon SoC:
   - SD5203 SoC

  Nvidia boards:
   - Tegra234 VDK, for pre-silicon Orin SoC

  NXP i.MX boards:
   - Librem 5 phone
   - i.MX8MM DDR4 EVK
   - Variscite VAR-SOM-MX8MN SoM
   - Symphony board
   - Tolino Shine 2 HD
   - TQMa6 SoM
   - Y Soft IOTA Orion

  Rockchip boards:
   - NanoPi R2S board
   - A95X-Z2 board
   - more Rock-Pi4 variants

  STM32 boards:
   - Odyssey SOM board (STM32MP157CAC-based)
   - DH DRC02 board

  Toshiba SoCs/boards:
   - Visconti SoC and TPMV7708 board"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (638 commits)
  ARM: dts: nspire: Fix SP804 users
  arm64: dts: lg: Fix SP804 users
  arm64: dts: lg: Fix SP805 clocks
  ARM: mstar: Fix up the fallout from moving the dts/dtsi files
  ARM: mstar: Add mstar prefix to all of the dtsi/dts files
  ARM: mstar: Add interrupt to pm_uart
  ARM: mstar: Add interrupt controller to base dtsi
  ARM: dts: meson8: remove two invalid interrupt lines from the GPU node
  arm64: dts: ti: k3-j7200-common-proc-board: Add USB support
  arm64: dts: ti: k3-j7200-common-proc-board: Configure the SERDES lane function
  arm64: dts: ti: k3-j7200-main: Add USB controller
  arm64: dts: ti: k3-j7200-main.dtsi: Add USB to SERDES lane MUX
  arm64: dts: ti: k3-j7200-main: Add SERDES lane control mux
  dt-bindings: ti-serdes-mux: Add defines for J7200 SoC
  ARM: dts: hisilicon: add SD5203 dts
  ARM: dts: hisilicon: fix the system controller compatible nodes
  arm64: dts: zynqmp: Fix leds subnode name for zcu100/ultra96 v1
  arm64: dts: zynqmp: Remove undocumented u-boot properties
  arm64: dts: zynqmp: Remove additional compatible string for i2c IPs
  arm64: dts: zynqmp: Rename buses to be align with simple-bus yaml
  ...
parents 2e368dd2 098bfcec

Documentation/devicetree/bindings/arm/actions.yaml

+11 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ properties: 
          - enum:

              - allo,sparky # Allo.com Sparky

              - cubietech,cubieboard6 # Cubietech CubieBoard6

              - roseapplepi,roseapplepi # RoseapplePi.org RoseapplePi

          - const: actions,s500

      - items:

          - enum:

              - caninos,labrador-base-m # Labrador Base Board M v1

          - const: caninos,labrador-v2  # Labrador Core v2

          - const: actions,s500

      - items:

          - enum:
@@ -28,6 +34,11 @@ properties: 
          - const: actions,s500



      # The Actions Semi S700 is a quad-core ARM Cortex-A53 SoC.

      - items:

          - enum:

              - caninos,labrador-base-m2 # Labrador Base Board M v2

          - const: caninos,labrador-v3   # Labrador Core v3

          - const: actions,s700

      - items:

          - enum:

              - cubietech,cubieboard7 # Cubietech CubieBoard7

Documentation/devicetree/bindings/arm/amlogic.yaml

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ properties: 
              - hwacom,amazetv

              - khadas,vim

              - libretech,aml-s905x-cc

              - libretech,aml-s905x-cc-v2

              - nexbox,a95x

          - const: amlogic,s905x

          - const: amlogic,meson-gxl
@@ -153,6 +154,7 @@ properties: 
              - azw,gtking

              - azw,gtking-pro

              - hardkernel,odroid-n2

              - hardkernel,odroid-n2-plus

              - khadas,vim3

              - ugoos,am6

          - const: amlogic,s922x

Documentation/devicetree/bindings/arm/atmel-at91.yaml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties: 
              - overkiz,kizboxmini-mb   # Overkiz kizbox Mini Mother Board

              - overkiz,kizboxmini-rd   # Overkiz kizbox Mini RailDIN

              - overkiz,smartkiz        # Overkiz SmartKiz Board

              - gardena,smart-gateway-at91sam # GARDENA smart Gateway (Article No. 19000)

          - const: atmel,at91sam9g25

          - const: atmel,at91sam9x5

          - const: atmel,at91sam9

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

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ properties: 
              - brcm,bcm953012er

              - brcm,bcm953012hr

              - brcm,bcm953012k

              - meraki,mr32

          - const: brcm,brcm53012

          - const: brcm,brcm53016

          - const: brcm,bcm4708

...

Documentation/devicetree/bindings/arm/fsl.yaml

+95 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ properties: 
              - fsl,imx6q-sabrelite

              - fsl,imx6q-sabresd

              - kontron,imx6q-samx6i      # Kontron i.MX6 Dual/Quad SMARC Module

              - logicpd,imx6q-logicpd

              - prt,prti6q                # Protonic PRTI6Q board

              - prt,prtwd2                # Protonic WD2 board

              - technexion,imx6q-pico-dwarf   # TechNexion i.MX6Q Pico-Dwarf
@@ -156,6 +157,21 @@ properties: 
          - const: gw,ventana

          - const: fsl,imx6q



      - description: i.MX6Q PHYTEC phyBOARD-Mira

        items:

          - enum:

              - phytec,imx6q-pbac06-emmc  # PHYTEC phyBOARD-Mira eMMC RDK

              - phytec,imx6q-pbac06-nand  # PHYTEC phyBOARD-Mira NAND RDK

          - const: phytec,imx6q-pbac06    # PHYTEC phyBOARD-Mira

          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6q



      - description: i.MX6Q PHYTEC phyFLEX-i.MX6

        items:

          - const: phytec,imx6q-pbab01    # PHYTEC phyFLEX carrier board

          - const: phytec,imx6q-pfla02    # PHYTEC phyFLEX-i.MX6 Quad

          - const: fsl,imx6q



      - description: i.MX6QP based Boards

        items:

          - enum:
@@ -163,6 +179,13 @@ properties: 
              - fsl,imx6qp-sabresd        # i.MX6 Quad Plus SABRE Smart Device Board

          - const: fsl,imx6qp



      - description: i.MX6QP PHYTEC phyBOARD-Mira

        items:

          - const: phytec,imx6qp-pbac06-nand

          - const: phytec,imx6qp-pbac06   # PHYTEC phyBOARD-Mira

          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6qp



      - description: i.MX6DL based Boards

        items:

          - enum:
@@ -188,6 +211,7 @@ properties: 
              - toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6 Module V1.1 on Colibri Evaluation Board V3

              - ysoft,imx6dl-yapp4-draco  # i.MX6 DualLite Y Soft IOTA Draco board

              - ysoft,imx6dl-yapp4-hydra  # i.MX6 DualLite Y Soft IOTA Hydra board

              - ysoft,imx6dl-yapp4-orion  # i.MX6 DualLite Y Soft IOTA Orion board

              - ysoft,imx6dl-yapp4-ursa   # i.MX6 Solo Y Soft IOTA Ursa board

          - const: fsl,imx6dl
@@ -211,10 +235,26 @@ properties: 
          - const: gw,ventana

          - const: fsl,imx6dl



      - description: i.MX6DL PHYTEC phyBOARD-Mira

        items:

          - enum:

              - phytec,imx6dl-pbac06-emmc # PHYTEC phyBOARD-Mira eMMC RDK

              - phytec,imx6dl-pbac06-nand # PHYTEC phyBOARD-Mira NAND RDK

          - const: phytec,imx6dl-pbac06   # PHYTEC phyBOARD-Mira

          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6dl



      - description: i.MX6DL PHYTEC phyFLEX-i.MX6

        items:

          - const: phytec,imx6dl-pbab01   # PHYTEC phyFLEX carrier board

          - const: phytec,imx6dl-pfla02   # PHYTEC phyFLEX-i.MX6 Quad

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:

              - fsl,imx6sl-evk            # i.MX6 SoloLite EVK Board

              - kobo,tolino-shine2hd

              - kobo,tolino-shine3

          - const: fsl,imx6sl
@@ -246,6 +286,15 @@ properties: 
              - technexion,imx6ul-pico-pi      # TechNexion i.MX6UL Pico-Pi

          - const: fsl,imx6ul



      - description: i.MX6UL PHYTEC phyBOARD-Segin

        items:

          - enum:

              - phytec,imx6ul-pbacd10-emmc

              - phytec,imx6ul-pbacd10-nand

          - const: phytec,imx6ul-pbacd10  # PHYTEC phyBOARD-Segin with i.MX6 UL

          - const: phytec,imx6ul-pcl063   # PHYTEC phyCORE-i.MX 6UL

          - const: fsl,imx6ul



      - description: Kontron N6310 S Board

        items:

          - const: kontron,imx6ul-n6310-s
@@ -277,6 +326,15 @@ properties: 
              - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board

          - const: fsl,imx6ull



      - description: i.MX6ULL PHYTEC phyBOARD-Segin

        items:

          - enum:

              - phytec,imx6ull-pbacd10-emmc

              - phytec,imx6ull-pbacd10-nand

          - const: phytec,imx6ull-pbacd10 # PHYTEC phyBOARD-Segin with i.MX6 ULL

          - const: phytec,imx6ull-pcl063  # PHYTEC phyCORE-i.MX 6ULL

          - const: fsl,imx6ull



      - description: Kontron N6411 S Board

        items:

          - const: kontron,imx6ull-n6411-s
@@ -344,7 +402,16 @@ properties: 
      - description: i.MX8MM based Boards

        items:

          - enum:

              - beacon,imx8mm-beacon-kit  # i.MX8MM Beacon Development Kit

              - fsl,imx8mm-ddr4-evk       # i.MX8MM DDR4 EVK Board

              - fsl,imx8mm-evk            # i.MX8MM EVK Board

              - variscite,var-som-mx8mm   # i.MX8MM Variscite VAR-SOM-MX8MM module

          - const: fsl,imx8mm



      - description: Variscite VAR-SOM-MX8MM based boards

        items:

          - const: variscite,var-som-mx8mm-symphony

          - const: variscite,var-som-mx8mm

          - const: fsl,imx8mm



      - description: i.MX8MN based Boards
@@ -354,6 +421,12 @@ properties: 
              - fsl,imx8mn-evk            # i.MX8MN LPDDR4 EVK Board

          - const: fsl,imx8mn



      - description: Variscite VAR-SOM-MX8MN based boards

        items:

          - const: variscite,var-som-mx8mn-symphony

          - const: variscite,var-som-mx8mn

          - const: fsl,imx8mn



      - description: i.MX8MP based Boards

        items:

          - enum:
@@ -372,13 +445,35 @@ properties: 
              - technexion,pico-pi-imx8m  # TechNexion PICO-PI-8M evk

          - const: fsl,imx8mq



      - description: Purism Librem5 phones

        items:

          - enum:

              - purism,librem5r2          # Purism Librem5 phone "Chestnut"

              - purism,librem5r3          # Purism Librem5 phone "Dogwood"

          - const: purism,librem5

          - const: fsl,imx8mq



      - description: Zodiac Inflight Innovations Ultra Boards

        items:

          - enum:

              - zii,imx8mq-ultra-rmb3

              - zii,imx8mq-ultra-zest

          - const: zii,imx8mq-ultra

          - const: fsl,imx8mq



      - description: i.MX8QXP based Boards

        items:

          - enum:

              - einfochips,imx8qxp-ai_ml  # i.MX8QXP AI_ML Board

              - fsl,imx8qxp-mek           # i.MX8QXP MEK Board

              - toradex,colibri-imx8x         # Colibri iMX8X Module

          - const: fsl,imx8qxp



      - description: Toradex Colibri i.MX8 Evaluation Board

        items:

          - enum:

              - toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3

          - const: toradex,colibri-imx8x

          - const: fsl,imx8qxp



      - description:

CRA Git | Maintained and supported by SUSTech CRA and CCSE