Commit 1afa9c3b 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 Device-tree updates from Olof Johansson:
 "New SoCs:

   - Atmel/Microchip SAM9X60 (ARM926 SoC)

   - OMAP 37xx gets split into AM3703/AM3715/DM3725, who are all
     variants of it with different GPU/media IP configurations.

   - ST stm32mp15 SoCs (1-2 Cortex-A7, CAN, GPU depending on SKU)

   - ST Ericsson ab8505 (variant of ab8500) and db8520 (variant of
     db8500)

   - Unisoc SC9863A SoC (8x Cortex-A55 mobile chipset w/ GPU, modem)

   - Qualcomm SC7180 (8-core 64bit SoC, unnamed CPU class)

  New boards:

   - Allwinner:
      + Emlid Neutis SoM (H3 variant)
      + Libre Computer ALL-H3-IT
      + PineH64 Model B

   - Amlogic:
      + Libretech Amlogic GX PC (s905d and s912-based variants)

   - Atmel/Microchip:
      + Kizboxmini, sam9x60 EK, sama5d27 Wireless SOM (wlsom1)

   - Marvell:
      + Armada 385-based SolidRun Clearfog GTR

   - NXP:
      + Gateworks GW59xx boards based on i.MX6/6Q/6QDL
      + Tolino Shine 3 eBook reader (i.MX6sl)
      + Embedded Artists COM (i.MX7ULP)
      + SolidRun CLearfog CX/ITX and HoneyComb (LX2160A-based systems)
      + Google Coral Edge TPU (i.MX8MQ)

   - Rockchip:
      + Radxa Dalang Carrier (supports rk3288 and rk3399 SOMs)
      + Radxa Rock Pi N10 (RK3399Pro-based)
      + VMARC RK3399Pro SOM

   - ST:
      + Reference boards for stm32mp15

   - ST Ericsson:
      + Samsung Galaxy S III mini (GT-I8190)
      + HREF520 reference board for DB8520

   - TI OMAP:
      + Gen1 Amazon Echo (OMAP3630-based)

   - Qualcomm:
      + Inforce 6640 Single Board Computer (msm8996-based)
      + SC7180 IDP (SC7180-based)"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (623 commits)
  dt-bindings: fix compilation error of the example in marvell,mmp3-hsic-phy.yaml
  arm64: dts: ti: k3-am654-base-board: Add CSI2 OV5640 camera
  arm64: dts: ti: k3-am65-main Add CAL node
  arm64: dts: ti: k3-j721e-main: Add McASP nodes
  arm64: dts: ti: k3-am654-main: Add McASP nodes
  arm64: dts: ti: k3-j721e: DMA support
  arm64: dts: ti: k3-j721e-main: Move secure proxy and smmu under main_navss
  arm64: dts: ti: k3-j721e-main: Correct main NAVSS representation
  arm64: dts: ti: k3-j721e: Correct the address for MAIN NAVSS
  arm64: dts: ti: k3-am65: DMA support
  arm64: dts: ti: k3-am65-main: Move secure proxy under cbass_main_navss
  arm64: dts: ti: k3-am65-main: Correct main NAVSS representation
  ARM: dts: aspeed: rainier: Add UCD90320 power sequencer
  ARM: dts: aspeed: rainier: Switch PSUs to unknown version
  arm64: dts: rockchip: Kill off "simple-panel" compatibles
  ARM: dts: rockchip: Kill off "simple-panel" compatibles
  arm64: dts: rockchip: rename dwmmc node names to mmc
  ARM: dts: rockchip: rename dwmmc node names to mmc
  arm64: dts: exynos: Rename Samsung and Exynos to lowercase
  arm64: dts: uniphier: add reset-names to NAND controller node
  ...
parents 469030d4 d030a0dd

Documentation/devicetree/bindings/arm/amlogic.yaml

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ properties: 
              - friendlyarm,nanopi-k2

              - hardkernel,odroid-c2

              - nexbox,a95x

              - videostrong,kii-pro

              - wetek,hub

              - wetek,play2

          - const: amlogic,meson-gxbb
@@ -104,6 +105,7 @@ properties: 
          - enum:

              - amlogic,p230

              - amlogic,p231

              - libretech,aml-s905d-pc

              - phicomm,n1

          - const: amlogic,s905d

          - const: amlogic,meson-gxl
@@ -115,6 +117,7 @@ properties: 
              - amlogic,q201

              - khadas,vim2

              - kingnovel,r-box-pro

              - libretech,aml-s912-pc

              - nexbox,a1

              - tronsmart,vega-s96

          - const: amlogic,s912

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

+31 −0
Original line number Diff line number Diff line
@@ -35,6 +35,16 @@ properties: 
              - atmel,at91sam9x60

          - const: atmel,at91sam9



      - items:

          - enum:

              - overkiz,kizboxmini-base # Overkiz kizbox Mini Base Board

              - overkiz,kizboxmini-mb   # Overkiz kizbox Mini Mother Board

              - overkiz,kizboxmini-rd   # Overkiz kizbox Mini RailDIN

              - overkiz,smartkiz        # Overkiz SmartKiz Board

          - const: atmel,at91sam9g25

          - const: atmel,at91sam9x5

          - const: atmel,at91sam9



      - items:

          - enum:

              - atmel,at91sam9g15
@@ -52,11 +62,32 @@ properties: 
          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: Microchip SAMA5D27 WLSOM1

        items:

          - const: microchip,sama5d27-wlsom1

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: Microchip SAMA5D27 WLSOM1 Evaluation Kit

        items:

          - const: microchip,sama5d27-wlsom1-ek

          - const: microchip,sama5d27-wlsom1

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - items:

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: SAM9X60-EK board

        items:

          - const: microchip,sam9x60ek

          - const: microchip,sam9x60

          - const: atmel,at91sam9



      - description: Nattis v2 board with Natte v2 power board

        items:

          - const: axentia,nattis-2

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ RAMC SDRAM/DDR Controller required properties: 
			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

			"microchip,sam9x60-ddramc"

- reg: Should contain registers location and length



Examples:

Documentation/devicetree/bindings/arm/fsl.yaml

+54 −0
Original line number Diff line number Diff line
@@ -128,6 +128,27 @@ properties: 
              - variscite,dt6customboard

          - const: fsl,imx6q



      - description: i.MX6Q Gateworks Ventana Boards

        items:

          - enum:

              - gw,imx6q-gw51xx

              - gw,imx6q-gw52xx

              - gw,imx6q-gw53xx

              - gw,imx6q-gw5400-a

              - gw,imx6q-gw54xx

              - gw,imx6q-gw551x

              - gw,imx6q-gw552x

              - gw,imx6q-gw553x

              - gw,imx6q-gw560x

              - gw,imx6q-gw5903

              - gw,imx6q-gw5904

              - gw,imx6q-gw5907

              - gw,imx6q-gw5910

              - gw,imx6q-gw5912

              - gw,imx6q-gw5913

          - const: gw,ventana

          - const: fsl,imx6q



      - description: i.MX6QP based Boards

        items:

          - enum:
@@ -154,10 +175,31 @@ properties: 
              - ysoft,imx6dl-yapp4-ursa   # i.MX6 Solo Y Soft IOTA Ursa board

          - const: fsl,imx6dl



      - description: i.MX6DL Gateworks Ventana Boards

        items:

          - enum:

              - gw,imx6dl-gw51xx

              - gw,imx6dl-gw52xx

              - gw,imx6dl-gw53xx

              - gw,imx6dl-gw54xx

              - gw,imx6dl-gw551x

              - gw,imx6dl-gw552x

              - gw,imx6dl-gw553x

              - gw,imx6dl-gw560x

              - gw,imx6dl-gw5903

              - gw,imx6dl-gw5904

              - gw,imx6dl-gw5907

              - gw,imx6dl-gw5910

              - gw,imx6dl-gw5912

              - gw,imx6dl-gw5913

          - const: gw,ventana

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:

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

              - kobo,tolino-shine3

          - const: fsl,imx6sl



      - description: i.MX6SLL based Boards
@@ -172,6 +214,7 @@ properties: 
          - enum:

              - fsl,imx6sx-sabreauto      # i.MX6 SoloX Sabre Auto Board

              - fsl,imx6sx-sdb            # i.MX6 SoloX SDB Board

              - fsl,imx6sx-sdb-reva       # i.MX6 SoloX SDB Rev-A Board

          - const: fsl,imx6sx



      - description: i.MX6UL based Boards
@@ -239,6 +282,7 @@ properties: 
        items:

          - enum:

              - fsl,imx7d-sdb             # i.MX7 SabreSD Board

              - fsl,imx7d-sdb-reva        # i.MX7 SabreSD Rev-A Board

              - novtech,imx7d-meerkat96   # i.MX7 Meerkat96 Board

              - toradex,colibri-imx7d                   # Colibri iMX7 Dual Module

              - toradex,colibri-imx7d-emmc              # Colibri iMX7 Dual 1GB (eMMC) Module
@@ -263,6 +307,7 @@ properties: 
      - description: i.MX7ULP based Boards

        items:

          - enum:

              - ea,imx7ulp-com           # i.MX7ULP Embedded Artists COM Board

              - fsl,imx7ulp-evk           # i.MX7ULP Evaluation Kit

          - const: fsl,imx7ulp
@@ -283,7 +328,9 @@ properties: 
        items:

          - enum:

              - boundary,imx8mq-nitrogen8m # i.MX8MQ NITROGEN Board

              - einfochips,imx8mq-thor96  # i.MX8MQ Thor96 Board

              - fsl,imx8mq-evk            # i.MX8MQ EVK Board

              - google,imx8mq-phanbell    # Google Coral Edge TPU

              - purism,librem5-devkit     # Purism Librem5 devkit

              - solidrun,hummingboard-pulse # SolidRun Hummingboard Pulse

              - technexion,pico-pi-imx8m  # TechNexion PICO-PI-8M evk
@@ -385,6 +432,13 @@ properties: 
              - fsl,ls2088a-rdb

          - const: fsl,ls2088a



      - description: LX2160A based Boards

        items:

          - enum:

              - fsl,lx2160a-qds

              - fsl,lx2160a-rdb

          - const: fsl,lx2160a



      - description: S32V234 based Boards

        items:

          - enum:

Documentation/devicetree/bindings/arm/qcom.yaml

+25 −19
Original line number Diff line number Diff line
@@ -28,24 +28,26 @@ description: | 
        apq8074

        apq8084

        apq8096

        ipq8074

        mdm9615

        msm8916

        msm8974

        msm8992

        msm8994

        msm8996

  	mdm9615

  	ipq8074

        sc7180

        sdm845



  The 'board' element must be one of the following strings:



        cdp

  	liquid

        dragonboard

  	mtp

  	sbc

        hk01

        idp

        liquid

        mtp

        qrd

        sbc



  The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor>

  where the minor number may be omitted when it's zero, i.e.  v1.0 is the same
@@ -144,4 +146,8 @@ properties: 
              - qcom,ipq8074-hk01

          - const: qcom,ipq8074



      - items:

          - enum:

              - qcom,sc7180-idp

          - const: qcom,sc7180

...

CRA Git | Maintained and supported by SUSTech CRA and CCSE