Commit e8a1d701 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:
 "Besides new bindings and additional descriptions of hardware blocks
  for various SoCs and boards, the main new contents here is:

  SoCs:
   - Intel Agilex (SoCFPGA)
   - NXP i.MX8MM (Quad Cortex-A53 with media/graphics focus)

  New boards:
   - Allwinner:
      + RerVision H3-DVK (H3)
      + Oceanic 5205 5inMFD (H6)
      + Beelink GS2 (H6)
      + Orange Pi 3 (H6)
   - Rockchip:
      + Orange Pi RK3399
      + Nanopi NEO4
      + Veyron-Mighty Chromebook variant
   - Amlogic:
      + SEI Robotics SEI510
   - ST Micro:
      + stm32mp157a discovery1
      + stm32mp157c discovery2
   - NXP:
      + Eckelmann ci4x10 (i.MX6DL)
      + i.MX8MM EVK (i.MX8MM)
      + ZII i.MX7 RPU2 (i.MX7)
      + ZII SPB4 (VF610)
      + Zii Ultra (i.MX8M)
      + TQ TQMa7S (i.MX7Solo)
      + TQ TQMa7D (i.MX7Dual)
      + Kobo Aura (i.MX50)
      + Menlosystems M53 (i.MX53)j
   - Nvidia:
      + Jetson Nano (Tegra T210)"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (593 commits)
  arm64: dts: bitmain: Add UART pinctrl support for Sophon Edge
  arm64: dts: bitmain: Add pinctrl support for BM1880 SoC
  arm64: dts: bitmain: Add GPIO Line names for Sophon Edge board
  arm64: dts: bitmain: Add GPIO support for BM1880 SoC
  ARM: dts: gemini: Indent DIR-685 partition table
  dt-bindings: hwmon (pwm-fan) Remove dead "cooling-*-state" properties
  ARM: dts: qcom-apq8064: Set 'cxo_board' as ref clock of the DSI PHY
  arm64: dts: msm8998: thermal: Restrict thermal zone name length to under 20
  arm64: dts: msm8998: thermal: Fix number of supported sensors
  arm64: dts: msm8998-mtp: thermal: Remove skin and battery thermal zones
  arm64: dts: exynos: Move fixed-clocks out of soc
  arm64: dts: exynos: Move pmu and timer nodes out of soc
  ARM: dts: s5pv210: Fix camera clock provider on Goni board
  ARM: dts: exynos: Properly override node to use MDMA0 on Universal C210
  ARM: dts: exynos: Move fixed-clocks out of soc on Exynos3250
  ARM: dts: exynos: Remove unneeded address/size cells from fixed-clock on Exynos3250
  ARM: dts: exynos: Move pmu and timer nodes out of soc
  arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
  arm64: dts: db820c: Add sound card support
  arm64: dts: apq8096-db820c: Add HDMI display support
  ...
parents 22c58fd7 6cbc4d88

Documentation/devicetree/bindings/arm/amlogic.txt

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ Board compatible values (alphabetically, grouped by SoC): 


  - "amlogic,u200" (Meson g12a s905d2)

  - "amediatech,x96-max" (Meson g12a s905x2)

  - "seirobotics,sei510" (Meson g12a s905x2)



Amlogic Meson Firmware registers Interface

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

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

+23 −6
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ Required properties: 
-------------------

- compatible:	should be "fsl,imx-scu".

- mbox-names:	should include "tx0", "tx1", "tx2", "tx3",

			       "rx0", "rx1", "rx2", "rx3".

- mboxes:	List of phandle of 4 MU channels for tx and 4 MU channels

		for rx. All 8 MU channels must be in the same MU instance.

			       "rx0", "rx1", "rx2", "rx3";

		include "gip3" if want to support general MU interrupt.

- mboxes:	List of phandle of 4 MU channels for tx, 4 MU channels for

		rx, and 1 optional MU channel for general interrupt.

		All MU channels must be in the same MU instance.

		Cross instances are not allowed. The MU instance can only

		be one of LSIO MU0~M4 for imx8qxp and imx8qm. Users need

		to make sure use the one which is not conflict with other
@@ -34,6 +36,7 @@ Required properties: 
		Channel 1 must be "tx1" or "rx1".

		Channel 2 must be "tx2" or "rx2".

		Channel 3 must be "tx3" or "rx3".

		General interrupt rx channel must be "gip3".

		e.g.

		mboxes = <&lsio_mu1 0 0

			  &lsio_mu1 0 1
@@ -42,10 +45,18 @@ Required properties: 
			  &lsio_mu1 1 0

			  &lsio_mu1 1 1

			  &lsio_mu1 1 2

			  &lsio_mu1 1 3>;

			  &lsio_mu1 1 3

			  &lsio_mu1 3 3>;

		See Documentation/devicetree/bindings/mailbox/fsl,mu.txt

		for detailed mailbox binding.



Note: Each mu which supports general interrupt should have an alias correctly

numbered in "aliases" node.

e.g.

aliases {

	mu1 = &lsio_mu1;

};



i.MX SCU Client Device Node:

============================================================
@@ -124,6 +135,10 @@ Required properties: 


Example (imx8qxp):

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

aliases {

	mu1 = &lsio_mu1;

};



lsio_mu1: mailbox@5d1c0000 {

	...

	#mbox-cells = <2>;
@@ -133,7 +148,8 @@ firmware { 
	scu {

		compatible = "fsl,imx-scu";

		mbox-names = "tx0", "tx1", "tx2", "tx3",

			     "rx0", "rx1", "rx2", "rx3";

			     "rx0", "rx1", "rx2", "rx3",

			     "gip3";

		mboxes = <&lsio_mu1 0 0

			  &lsio_mu1 0 1

			  &lsio_mu1 0 2
@@ -141,7 +157,8 @@ firmware { 
			  &lsio_mu1 1 0

			  &lsio_mu1 1 1

			  &lsio_mu1 1 2

			  &lsio_mu1 1 3>;

			  &lsio_mu1 1 3

			  &lsio_mu1 3 3>;



		clk: clk {

			compatible = "fsl,imx8qxp-clk", "fsl,scu-clk";

Documentation/devicetree/bindings/arm/fsl.yaml

+36 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ properties: 
          - const: i2se,duckbill-2

          - const: fsl,imx28



      - description: i.MX50 based Boards

        items:

          - enum:

              - fsl,imx50-evk

              - kobo,aura

          - const: fsl,imx50



      - description: i.MX51 Babbage Board

        items:

          - enum:
@@ -67,6 +74,7 @@ properties: 
              - fsl,imx53-evk

              - fsl,imx53-qsb

              - fsl,imx53-smd

              - menlo,m53menlo

          - const: fsl,imx53



      - description: i.MX6Q based Boards
@@ -90,6 +98,7 @@ properties: 
      - description: i.MX6DL based Boards

        items:

          - enum:

              - eckelmann,imx6dl-ci4x10

              - fsl,imx6dl-sabreauto      # i.MX6 DualLite/Solo SABRE Automotive Board

              - fsl,imx6dl-sabresd        # i.MX6 DualLite SABRE Smart Device Board

              - technologic,imx6dl-ts4900
@@ -137,10 +146,18 @@ properties: 
          - const: fsl,imx6ull # This seems odd. Should be last?

          - const: fsl,imx6ulz



      - description: i.MX7S based Boards

        items:

          - enum:

              - tq,imx7s-mba7             # i.MX7S TQ MBa7 with TQMa7S SoM

          - const: fsl,imx7s



      - description: i.MX7D based Boards

        items:

          - enum:

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

              - tq,imx7d-mba7             # i.MX7D TQ MBa7 with TQMa7D SoM

              - zii,imx7d-rpu2            # ZII RPU2 Board

          - const: fsl,imx7d



      - description:
@@ -154,6 +171,12 @@ properties: 
          - const: compulab,cl-som-imx7

          - const: fsl,imx7d



      - description: i.MX8MM based Boards

        items:

          - enum:

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

          - const: fsl,imx8mm



      - description: i.MX8QXP based Boards

        items:

          - enum:
@@ -176,6 +199,19 @@ properties: 
              - fsl,vf610

              - fsl,vf610m4



      - description: ZII's VF610 based Boards

        items:

          - enum:

              - zii,vf610cfu1      # ZII VF610 CFU1 Board

              - zii,vf610dev-c     # ZII VF610 Development Board, Rev C

              - zii,vf610dev-b     # ZII VF610 Development Board, Rev B

              - zii,vf610scu4-aib  # ZII VF610 SCU4 AIB

              - zii,vf610dtu       # ZII VF610 SSMB DTU Board

              - zii,vf610spu3      # ZII VF610 SSMB SPU3 Board

              - zii,vf610spb4      # ZII VF610 SPB4 Board

          - const: zii,vf610dev

          - const: fsl,vf610



      - description: LS1012A based Boards

        items:

          - enum:

Documentation/devicetree/bindings/arm/omap/omap.txt

+6 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ SoCs: 
- DRA718

  compatible = "ti,dra718", "ti,dra722", "ti,dra72", "ti,dra7"



- AM5748

  compatible = "ti,am5748", "ti,dra762", "ti,dra7"



- AM5728

  compatible = "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"
@@ -184,6 +187,9 @@ Boards: 
- AM57XX SBC-AM57x

  compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"



- AM5748 IDK

  compatible = "ti,am5748-idk", "ti,am5748", "ti,dra762", "ti,dra7";



- AM5728 IDK

  compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"

Documentation/devicetree/bindings/arm/rockchip.yaml

+24 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ properties: 
          - enum:

              - friendlyarm,nanopc-t4

              - friendlyarm,nanopi-m4

              - friendlyarm,nanopi-neo4

          - const: rockchip,rk3399



      - description: GeekBuying GeekBox
@@ -146,7 +147,7 @@ properties: 
          - const: google,gru

          - const: rockchip,rk3399



      - description: Google Jaq (Haier Chromebook 11 and more)

      - description: Google Jaq (Haier Chromebook 11 and more w/ uSD)

        items:

          - const: google,veyron-jaq-rev5

          - const: google,veyron-jaq-rev4
@@ -159,6 +160,12 @@ properties: 


      - description: Google Jerry (Hisense Chromebook C11 and more)

        items:

          - const: google,veyron-jerry-rev15

          - const: google,veyron-jerry-rev14

          - const: google,veyron-jerry-rev13

          - const: google,veyron-jerry-rev12

          - const: google,veyron-jerry-rev11

          - const: google,veyron-jerry-rev10

          - const: google,veyron-jerry-rev7

          - const: google,veyron-jerry-rev6

          - const: google,veyron-jerry-rev5
@@ -199,6 +206,17 @@ properties: 
          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Mighty (Haier Chromebook 11 and more w/ SD)

        items:

          - const: google,veyron-mighty-rev5

          - const: google,veyron-mighty-rev4

          - const: google,veyron-mighty-rev3

          - const: google,veyron-mighty-rev2

          - const: google,veyron-mighty-rev1

          - const: google,veyron-mighty

          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Minnie (Asus Chromebook Flip C100P)

        items:

          - const: google,veyron-minnie-rev4
@@ -308,6 +326,11 @@ properties: 
          - const: netxeon,r89

          - const: rockchip,rk3288



      - description: Orange Pi RK3399 board

        items:

          - const: rockchip,rk3399-orangepi

          - const: rockchip,rk3399



      - description: Phytec phyCORE-RK3288 Rapid Development Kit

        items:

          - const: phytec,rk3288-pcm-947

CRA Git | Maintained and supported by SUSTech CRA and CCSE