Commit 7c636d4d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC DT updates from Arnd Bergmann:
 "As usual, the bulk of work in the SoC tree goes into DT files, this
  time with a roughly even split between 32-bit and 64-bit SoCs rather
  than the usual mostly 64-bit changes.

  New SoCs:

   - Microchip SAMA7 SoC family based on Cortex-A7, a new 32-bit
     platform based on the older SAMA5 series.

   - Qualcomm Snapdragon SDM636 and SM8150, variations of the existing
     phone SoCs.

   - Renesas R-Car H3e-2G and M3e-2G SoCs, variations of older Renesas
     SoCs.

  New boards:

   - Marvell CN913x reference boards

   - ASpeed AST2600 BMC implementations for Facebook Cloudripper, Elbert
     and Fuji server boards.

   - Snapdragon 665 based Sony Xperia 10II

   - Snapdragon MSM8916 based Xiaomi Redmi 2

   - Snapdragon MSM8226 based Samsung Galaxy S3 Neo

   - NXP i.MX based 32-bit boards:
       - DHCOM based PicoITX
       - DHSOM based DRC0ỉ
       - SolidRun SolidSense
       - SKOV i.MX6 boards.

   - NXP i.MX based 64-bit boards:
       - Nitrogen8 SoM and MNT Reform2
       - LS1088A based Traverse Ten64
       - i.MX8M based GW7902.

   - NVIDIA Jetson TX2 NX Developer Kit

   - 4KOpen STiH418-b2264 development board

   - ux500 based Samsung phones: Gavini, Codina and Kyle

   - TI AM335x based Sancloud BBE Lite

   - ixp4xx dts files to replace all old board files

  Other changes:

   - Treewide fixes for dtc warnings

   - Rockchips i/o domain support

   - TI OMAP/AM3 CPSW switch driver support

   - Improved device support for allwinner, aspeed, qualcomm, NXP,
     nvidia, Renesas, Samsung, Amlogic, Mediatek, ixp4xx, stm32, sti,
     OMAP and actions"

* tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (412 commits)
  arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings
  ARM: dts: rockchip: Add SFC to RV1108
  arm64: dts: marvell: armada-37xx: Extend PCIe MEM space
  ARM: dts: aspeed: p10bmc: Add power control pins
  ARM: dts: aspeed: cloudripper: Add comments for "mdio1"
  ARM: dts: aspeed: minipack: Update flash partition table
  dt-bindings: arm: fsl: Add Traverse Ten64 (LS1088A) board
  dt-bindings: vendor-prefixes: add Traverse Technologies
  arm64: dts: add device tree for Traverse Ten64 (LS1088A)
  arm64: dts: ls1088a: add missing PMU node
  arm64: dts: ls1088a: add internal PCS for DPMAC1 node
  ARM: dts: imx6qp-prtwd3: configure ENET_REF clock to 125MHz
  ARM: dts: vf610-zii-dev-rev-b: Remove #address-cells and #size-cells property from at93c46d dt node
  ARM: dts: add SKOV imx6q and imx6dl based boards
  dt-bindings: arm: fsl: add SKOV imx6q and imx6dl based boards
  dt-bindings: vendor-prefixes: Add an entry for SKOV A/S
  arm64: dts: imx8mq-reform2: add sound support
  arm64: dts: imx8m: drop interrupt-affinity for pmu
  arm64: dts: imx8qxp: update pmu compatible
  arm64: dts: imx8mm: update pmu compatible
  ...
parents 32b47072 9e62ec0e

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

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ properties: 
          - const: atmel,sama5d4

          - const: atmel,sama5



      - items:

          - const: microchip,sama7g5ek # SAMA7G5 Evaluation Kit

          - const: microchip,sama7g5

          - const: microchip,sama7



      - items:

          - enum:

              - atmel,sams70j19

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

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

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

			"microchip,sam9x60-ddramc"

			"microchip,sam9x60-ddramc",

			"microchip,sama7g5-uddrc"

- reg: Should contain registers location and length



Examples:
@@ -55,6 +56,17 @@ Examples: 
		reg = <0xffffe800 0x200>;

	};



RAMC PHY Controller required properties:

- compatible: Should be "microchip,sama7g5-ddr3phy", "syscon"

- reg: Should contain registers location and length



Example:



	ddr3phy: ddr3phy@e3804000 {

		compatible = "microchip,sama7g5-ddr3phy", "syscon";

		reg = <0xe3804000 0x1000>;

};



SHDWC Shutdown Controller



required properties:

Documentation/devicetree/bindings/arm/fsl.yaml

+29 −0
Original line number Diff line number Diff line
@@ -221,9 +221,13 @@ properties: 
              - prt,prti6q                # Protonic PRTI6Q board

              - prt,prtwd2                # Protonic WD2 board

              - rex,imx6q-rex-pro         # Rex Pro i.MX6 Quad Board

              - skov,imx6q-skov-revc-lt2  # SKOV IMX6 CPU QuadCore lt2

              - skov,imx6q-skov-revc-lt6  # SKOV IMX6 CPU QuadCore lt6

              - skov,imx6q-skov-reve-mi1010ait-1cp1 # SKOV IMX6 CPU QuadCore mi1010ait-1cp1

              - solidrun,cubox-i/q        # SolidRun Cubox-i Dual/Quad

              - solidrun,hummingboard/q

              - solidrun,hummingboard2/q

              - solidrun,solidsense/q     # SolidRun SolidSense Dual/Quad

              - tbs,imx6q-tbs2910         # TBS2910 Matrix ARM mini PC

              - technexion,imx6q-pico-dwarf   # TechNexion i.MX6Q Pico-Dwarf

              - technexion,imx6q-pico-hobbit  # TechNexion i.MX6Q Pico-Hobbit
@@ -377,9 +381,12 @@ properties: 
              - prt,prtvt7                # Protonic VT7 board

              - rex,imx6dl-rex-basic      # Rex Basic i.MX6 Dual Lite Board

              - riot,imx6s-riotboard      # RIoTboard i.MX6S

              - skov,imx6dl-skov-revc-lt2 # SKOV IMX6 CPU SoloCore lt2

              - skov,imx6dl-skov-revc-lt6 # SKOV IMX6 CPU SoloCore lt6

              - solidrun,cubox-i/dl            # SolidRun Cubox-i Solo/DualLite

              - solidrun,hummingboard/dl

              - solidrun,hummingboard2/dl      # SolidRun HummingBoard2 Solo/DualLite

              - solidrun,solidsense/dl         # SolidRun SolidSense Solo/DualLite

              - technexion,imx6dl-pico-dwarf   # TechNexion i.MX6DL Pico-Dwarf

              - technexion,imx6dl-pico-hobbit  # TechNexion i.MX6DL Pico-Hobbit

              - technexion,imx6dl-pico-nymph   # TechNexion i.MX6DL Pico-Nymph
@@ -418,6 +425,12 @@ properties: 
          - const: dfi,fs700e-m60

          - const: fsl,imx6dl



      - description: i.MX6DL DHCOM PicoITX Board

        items:

          - const: dh,imx6dl-dhcom-picoitx

          - const: dh,imx6dl-dhcom-som

          - const: fsl,imx6dl



      - description: i.MX6DL Gateworks Ventana Boards

        items:

          - enum:
@@ -469,6 +482,12 @@ properties: 
          - const: toradex,colibri_imx6dl          # Colibri iMX6 Module

          - const: fsl,imx6dl



      - description: i.MX6S DHCOM DRC02 Board

        items:

          - const: dh,imx6s-dhcom-drc02

          - const: dh,imx6s-dhcom-som

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:
@@ -698,6 +717,7 @@ properties: 
              - gw,imx8mm-gw72xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw73xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw7901          # i.MX8MM Gateworks Board

              - gw,imx8mm-gw7902          # i.MX8MM Gateworks Board

              - kontron,imx8mm-n801x-som  # i.MX8MM Kontron SL (N801X) SOM

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

          - const: fsl,imx8mm
@@ -728,6 +748,7 @@ properties: 
              - beacon,imx8mn-beacon-kit  # i.MX8MN Beacon Development Kit

              - fsl,imx8mn-ddr4-evk       # i.MX8MN DDR4 EVK Board

              - fsl,imx8mn-evk            # i.MX8MN LPDDR4 EVK Board

              - gw,imx8mn-gw7902          # i.MX8MM Gateworks Board

          - const: fsl,imx8mn



      - description: Variscite VAR-SOM-MX8MN based boards
@@ -752,10 +773,12 @@ properties: 
        items:

          - enum:

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

              - boundary,imx8mq-nitrogen8m-som # i.MX8MQ NITROGEN SoM

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

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

              - google,imx8mq-phanbell    # Google Coral Edge TPU

              - kontron,pitx-imx8m        # Kontron pITX-imx8m Board

              - mntre,reform2             # MNT Reform2 Laptop

              - purism,librem5-devkit     # Purism Librem5 devkit

              - solidrun,hummingboard-pulse # SolidRun Hummingboard Pulse

              - technexion,pico-pi-imx8m  # TechNexion PICO-PI-8M evk
@@ -973,6 +996,12 @@ properties: 
              - fsl,s32v234-evb           # S32V234-EVB2 Customer Evaluation Board

          - const: fsl,s32v234



      - description: Traverse LS1088A based Boards

        items:

          - enum:

              - traverse,ten64            # Ten64 Networking Appliance / Board

          - const: fsl,ls1088a



additionalProperties: true



...

Documentation/devicetree/bindings/arm/qcom.yaml

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ description: | 
        ipq6018

        ipq8074

        mdm9615

        msm8226

        msm8916

        msm8974

        msm8992
@@ -114,6 +115,11 @@ properties: 
              - qcom,apq8084-sbc

          - const: qcom,apq8084



      - items:

          - enum:

              - samsung,s3ve3g

          - const: qcom,msm8226



      - items:

          - enum:

              - qcom,msm8960-cdp
@@ -129,6 +135,8 @@ properties: 
          - const: qcom,msm8974



      - items:

          - enum:

              - alcatel,idol347

          - const: qcom,msm8916-mtp/1

          - const: qcom,msm8916-mtp

          - const: qcom,msm8916
@@ -181,6 +189,8 @@ properties: 
      - items:

          - enum:

              - qcom,sc7280-idp

              - qcom,sc7280-idp2

              - google,piglin

              - google,senor

          - const: qcom,sc7280

Documentation/devicetree/bindings/arm/renesas.yaml

+39 −11
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ properties: 
          - const: renesas,r8a77961



      - description: Kingfisher (SBEV-RCAR-KF-M03)

        items:

        oneOf:

          - items:

              - const: shimafuji,kingfisher

              - enum:

                  - renesas,h3ulcb
@@ -249,6 +250,17 @@ properties: 
                  - renesas,r8a7796

                  - renesas,r8a77961

                  - renesas,r8a77965

          - items:

              - const: shimafuji,kingfisher

              - enum:

                  - renesas,h3ulcb

                  - renesas,m3ulcb

              - enum:

                  - renesas,r8a779m1

                  - renesas,r8a779m3

              - enum:

                  - renesas,r8a7795

                  - renesas,r8a77961



      - description: R-Car M3-N (R8A77965)

        items:
@@ -296,6 +308,22 @@ properties: 
          - const: renesas,falcon-cpu

          - const: renesas,r8a779a0



      - description: R-Car H3e-2G (R8A779M1)

        items:

          - enum:

              - renesas,h3ulcb      # H3ULCB (R-Car Starter Kit Premier)

              - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version)

          - const: renesas,r8a779m1

          - const: renesas,r8a7795



      - description: R-Car M3e-2G (R8A779M3)

        items:

          - enum:

              - renesas,m3ulcb      # M3ULCB (R-Car Starter Kit Pro)

              - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version)

          - const: renesas,r8a779m3

          - const: renesas,r8a77961



      - description: RZ/N1D (R9A06G032)

        items:

          - enum: