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

Pull ARM device-tree updates from Arnd Bergmann:
 "We add device tree files for a couple of additional SoCs in various
  areas:

  Allwinner R40/V40 for entertainment, Broadcom Hurricane 2 for
  networking, Amlogic A113D for audio, and Renesas R-Car V3M for
  automotive.

  As usual, lots of new boards get added based on those and other SoCs:

   - Actions S500 based CubieBoard6 single-board computer

   - Amlogic Meson-AXG A113D based development board
   - Amlogic S912 based Khadas VIM2 single-board computer
   - Amlogic S912 based Tronsmart Vega S96 set-top-box

   - Allwinner H5 based NanoPi NEO Plus2 single-board computer
   - Allwinner R40 based Banana Pi M2 Ultra and Berry single-board computers
   - Allwinner A83T based TBS A711 Tablet

   - Broadcom Hurricane 2 based Ubiquiti UniFi Switch 8
   - Broadcom bcm47xx based Luxul XAP-1440/XAP-810/ABR-4500/XBR-4500
     wireless access points and routers

   - NXP i.MX51 based Zodiac Inflight Innovations RDU1 board
   - NXP i.MX53 based GE Healthcare PPD biometric monitor
   - NXP i.MX6 based Pistachio single-board computer
   - NXP i.MX6 based Vining-2000 automotive diagnostic interface
   - NXP i.MX6 based Ka-Ro TX6 Computer-on-Module in additional variants

   - Qualcomm MSM8974 (Snapdragon 800) based Fairphone 2 phone
   - Qualcomm MSM8974pro (Snapdragon 801) based Sony Xperia Z2 Tablet

   - Realtek RTD1295 based set-top-boxes MeLE V9 and PROBOX2 AVA

   - Renesas R-Car V3M (R8A77970) SoC and "Eagle" reference board
   - Renesas H3ULCB and M3ULCB "Kingfisher" extension infotainment boards
   - Renasas r8a7745 based iWave G22D-SODIMM SoM

   - Rockchip rk3288 based Amarula Vyasa single-board computer

   - Samsung Exynos5800 based Odroid HC1 single-board computer

  For existing SoC support, there was a lot of ongoing work, as usual
  most of that concentrated on the Renesas, Rockchip, OMAP, i.MX,
  Amlogic and Allwinner platforms, but others were also active.

  Rob Herring and many others worked on reducing the number of issues
  that the latest version of 'dtc' now warns about. Unfortunately there
  is still a lot left to do.

  A rework of the ARM foundation model introduced several new files for
  common variations of the model"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (599 commits)
  arm64: dts: uniphier: route on-board device IRQ to GPIO controller for PXs3
  dt-bindings: bus: Add documentation for the Technologic Systems NBUS
  arm64: dts: actions: s900-bubblegum-96: Add fake uart5 clock
  ARM: dts: owl-s500: Add CubieBoard6
  dt-bindings: arm: actions: Add CubieBoard6
  ARM: dts: owl-s500-guitar-bb-rev-b: Add fake uart3 clock
  ARM: dts: owl-s500: Set power domains for CPU2 and CPU3
  arm: dts: mt7623: remove unused compatible string for pio node
  arm: dts: mt7623: update usb related nodes
  arm: dts: mt7623: update crypto node
  ARM: dts: sun8i: a711: Enable USB OTG
  ARM: dts: sun8i: a711: Add regulator support
  ARM: dts: sun8i: a83t: bananapi-m3: Enable AP6212 WiFi on mmc1
  ARM: dts: sun8i: a83t: cubietruck-plus: Enable AP6330 WiFi on mmc1
  ARM: dts: sun8i: a83t: Move mmc1 pinctrl setting to dtsi file
  ARM: dts: sun8i: a83t: allwinner-h8homlet-v2: Add AXP818 regulator nodes
  ARM: dts: sun8i: a83t: bananapi-m3: Add AXP813 regulator nodes
  ARM: dts: sun8i: a83t: cubietruck-plus: Add AXP818 regulator nodes
  ARM: dts: sunxi: Add dtsi for AXP81x PMIC
  arm64: dts: allwinner: H5: Restore EMAC changes
  ...

diff --cc Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
Simple merge

diff --cc Documentation/devicetree/bindings/dma/sun6i-dma.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/aspeed-ast2500-evb.dts
Simple merge

diff --cc arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
Simple merge

diff --cc arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
Simple merge

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

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

diff --cc arch/arm/boot/dts/at91-ariettag25.dts
Simple merge

diff --cc arch/arm/boot/dts/at91-sama5d2_xplained.dts
Simple merge

diff --cc arch/arm/boot/dts/bcm2837-rpi-3-b.dts
Simple merge

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

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

diff --cc arch/arm/boot/dts/imx28-apx4devkit.dts
Simple merge

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

diff --cc arch/arm/boot/dts/integratorap.dts
Simple merge

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

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

diff --cc arch/arm/boot/dts/omap2420-n8x0-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
Simple merge

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

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

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

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

diff --cc arch/arm/boot/dts/stm32f746.dtsi
index 5f941789405903f08db94c632c84279e0944ad39,5930a08b8dfabf4d8f9dcd5f5ccba8d4b2045a27..5f66d151eedb15fa5481323a17bae4f23c1d404c
--- 1/arch/arm/boot/dts/stm32f746.dtsi
--- 2/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@@ -192,8 -371,50 +371,50 @@@
                        status = "disabled";
                };
  
+               timers1: timers@40010000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "st,stm32-timers";
+                       reg = <0x40010000 0x400>;
+                       clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM1)>;
+                       clock-names = "int";
+                       status = "disabled";
+ 
+                       pwm {
+                               compatible = "st,stm32-pwm";
+                               status = "disabled";
+                       };
+ 
+                       timer@0 {
+                               compatible = "st,stm32-timer-trigger";
+                               reg = <0>;
+                               status = "disabled";
+                       };
+               };
+ 
+               timers8: timers@40010400 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "st,stm32-timers";
+                       reg = <0x40010400 0x400>;
+                       clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM8)>;
+                       clock-names = "int";
+                       status = "disabled";
+ 
+                       pwm {
+                               compatible = "st,stm32-pwm";
+                               status = "disabled";
+                       };
+ 
+                       timer@7 {
+                               compatible = "st,stm32-timer-trigger";
+                               reg = <7>;
+                               status = "disabled";
+                       };
+               };
+ 
                usart1: serial@40011000 {
 -                      compatible = "st,stm32f7-usart", "st,stm32f7-uart";
 +                      compatible = "st,stm32f7-uart";
                        reg = <0x40011000 0x400>;
                        interrupts = <37>;
                        clocks = <&rcc 1 CLK_USART1>;

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

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

diff --cc arch/arm/boot/dts/tegra124-jetson-tk1.dts
Simple merge

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

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

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

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

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

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

diff --cc arch/arm64/boot/dts/allwinner/Makefile
index 7d3acb355ff3acd7bb5d3d6345bab3eb4b258a2f,5d88df3533e1f8257b5d84d517f4b0ad7c80e4ef..f505227b02508ee45d2aef52f42ae5264bdaa5d8
--- 1/arch/arm64/boot/dts/allwinner/Makefile
--- 2/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@@ -9,3 -8,8 +9,4 @@@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-o
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
 -
 -always                := $(dtb-y)
 -subdir-y      := $(dts-dirs)
 -clean-files   := *.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb

diff --cc arch/arm64/boot/dts/amlogic/Makefile
index f84b83bb9809e9c7b5df4161d65854420f9f9072,3d6b088d2160288bbfb001bc419c7ca490e092d8..34dd0e9b5cbbc102e38880bacc85575544854090
--- 1/arch/arm64/boot/dts/amlogic/Makefile
--- 2/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@@ -1,4 -1,4 +1,5 @@@
 +# SPDX-License-Identifier: GPL-2.0
+ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
@@@ -20,3 -21,8 +22,4 @@@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-n
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
 -
 -always                := $(dtb-y)
 -subdir-y      := $(dts-dirs)
 -clean-files   := *.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb

diff --cc arch/arm64/boot/dts/arm/Makefile
index 4256bae9992500a0aaacb5fa4aee6b6621ad6237,25f82c377f675ab6cac3d9e7429143f6ba9c2dad..5b45144b371ae215c44131377865af1586a07a06
--- 1/arch/arm64/boot/dts/arm/Makefile
--- 2/arch/arm64/boot/dts/arm/Makefile
+++ b/arch/arm64/boot/dts/arm/Makefile
@@@ -1,5 -1,6 +1,7 @@@
- dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb
 +# SPDX-License-Identifier: GPL-2.0
+ dtb-$(CONFIG_ARCH_VEXPRESS) += \
+       foundation-v8.dtb foundation-v8-psci.dtb \
+       foundation-v8-gicv3.dtb foundation-v8-gicv3-psci.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb

diff --cc arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
Simple merge

diff --cc arch/arm64/boot/dts/arm/foundation-v8.dts
Simple merge

diff --cc arch/arm64/boot/dts/arm/foundation-v8.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
Simple merge

diff --cc arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
Simple merge

diff --cc arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index fe1ea5d707a8f7ec3dc0af3e66c05dd754f7528b,3b0b6e4fdc11ac2e0e923862ad45fd32ab9cd228..82b272fb41b9748489e401d2d4078a030bd2eccf
--- 1/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
--- 2/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@@ -471,36 -484,12 +484,43 @@@
                        dr_mode = "host";
                        phy_type = "ulpi";
                };
 +
 +              msi: msi-controller1@1572000 {
 +                      compatible = "fsl,ls1012a-msi";
 +                      reg = <0x0 0x1572000 0x0 0x8>;
 +                      msi-controller;
 +                      interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;
 +              };
 +
 +              pcie@3400000 {
 +                      compatible = "fsl,ls1012a-pcie", "snps,dw-pcie";
 +                      reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
 +                             0x40 0x00000000 0x0 0x00002000>; /* configuration space */
 +                      reg-names = "regs", "config";
 +                      interrupts = <0 118 0x4>, /* controller interrupt */
 +                                   <0 117 0x4>; /* PME interrupt */
 +                      interrupt-names = "aer", "pme";
 +                      #address-cells = <3>;
 +                      #size-cells = <2>;
 +                      device_type = "pci";
 +                      num-lanes = <4>;
 +                      bus-range = <0x0 0xff>;
 +                      ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
 +                                0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
 +                      msi-parent = <&msi>;
 +                      #interrupt-cells = <1>;
 +                      interrupt-map-mask = <0 0 0 7>;
 +                      interrupt-map = <0000 0 0 1 &gic 0 110 IRQ_TYPE_LEVEL_HIGH>,
 +                                      <0000 0 0 2 &gic 0 111 IRQ_TYPE_LEVEL_HIGH>,
 +                                      <0000 0 0 3 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>,
 +                                      <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
 +              };
        };
+ 
+       firmware {
+               optee {
+                       compatible = "linaro,optee-tz";
+                       method = "smc";
+               };
+       };
  };

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

diff --cc arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
Simple merge

diff --cc arch/arm64/boot/dts/hisilicon/hi3660.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/hisilicon/hi6220.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
Simple merge

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

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

diff --cc arch/arm64/boot/dts/realtek/Makefile
index 6e2ae59a374537be15c2e8efde168ad87470d229,ee9bcf332c77b7ccdb95ba641f736dda56da6f65..c108d73f8766ccb70b6c768dc757cfb7ee7b3bac
--- 1/arch/arm64/boot/dts/realtek/Makefile
--- 2/arch/arm64/boot/dts/realtek/Makefile
+++ b/arch/arm64/boot/dts/realtek/Makefile
@@@ -1,1 -1,7 +1,3 @@@
+ dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-mele-v9.dtb
+ dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-probox2-ava.dtb
  dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb
 -
 -always                := $(dtb-y)
 -subdir-y      := $(dts-dirs)
 -clean-files   := *.dtb

diff --cc arch/arm64/boot/dts/renesas/Makefile
index 6b282283f1bfea096251f4bdfb585b18bedd2a7f,53a91225ec0616da248e8b0eb8e7c4a4b7d9c493..646198d829035882e8fbe130aac9b7aa4808c3d0
--- 1/arch/arm64/boot/dts/renesas/Makefile
--- 2/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@@ -1,6 -1,12 +1,10 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb
+ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb
  dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
  dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
+ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb
  dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
+ dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb
+ dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb
  dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
 -
 -always                := $(dtb-y)
 -clean-files   := *.dtb

diff --cc arch/arm64/boot/dts/renesas/salvator-common.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/rockchip/rk3368.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
Simple merge

diff --cc arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
Simple merge

diff --cc include/dt-bindings/clock/tegra210-car.h
Simple merge

diff --cc include/dt-bindings/pinctrl/am43xx.h
Simple merge