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
  ...

diff --cc Documentation/devicetree/bindings/arm/actions.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/arm/qcom.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/arm/samsung/pmu.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/arm/stm32/stm32.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/arm/tegra.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 07bdfdd7b31c1fb01fa5618aba5124df26bc6883,639137945c3c9528ab8f52015ab7fd4d56411c35..2735be1a84709587e36ef3f0cb855d14ad6c0391
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1222,8 -1204,8 +1228,10 @@@ patternProperties
      description: Shenzhen Zidoo Technology Co., Ltd.
    "^zii,.*":
      description: Zodiac Inflight Innovations
 +  "^zinitix,.*":
 +    description: Zinitix Co., Ltd
+   "^zkmagic,.*":
+     description: Shenzhen Zkmagic Technology Co., Ltd.
    "^zte,.*":
      description: ZTE Corp.
    "^zyxel,.*":

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am437x-l4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/bcm-nsp.dtsi
Simple merge

diff --cc arch/arm/boot/dts/bcm2711-rpi-4-b.dts
Simple merge

diff --cc arch/arm/boot/dts/bcm5301x.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7-l4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx6q-logicpd.dts
Simple merge

diff --cc arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx7d-zii-rmu2.dts
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sam9x60.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/freescale/Makefile
index 903c0eb61290d320d719a83c5991e747a5afae61,c7890b6225878f903a6bc580247f00513b363e9c..f8d59433af01bdf4eb9d9efa59fa725150ab704a
--- 1/arch/arm64/boot/dts/freescale/Makefile
--- 2/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@@ -28,10 -28,12 +28,13 @@@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx
  dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb
  dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb
  
 +dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mn-var-som-symphony.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb

diff --cc arch/arm64/boot/dts/freescale/imx8mp.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/freescale/imx8mq.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/nvidia/tegra186.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/nvidia/tegra194.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/nvidia/tegra210.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sdm845.dtsi
Simple merge

diff --cc arch/arm64/configs/defconfig
Simple merge