Merge tag 'imx-dt64-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX arm64 device tree change for 6.1:

- New board support: i.MX8DXL EVK, Kontron SL/BL i.MX8MM OSM-S, i.MX8MM
  Gateworks GW7904, MSC SM2S-IMX8PLUS SoM and carrier board, NXP
  LS2081ARDB.
- Update i.MX8MQ device tree to use generic name 'dma-controller' for
  SDMA.
- A number of i.MX8ULP device tree improvements and updates: correct
  parent clock of LPI2C & LPSPI, increase the clock speed of LPSPI, add
  PMU and mailbox device, drop undocumented CGC property, enable FEC, etc.
- Add interconnect property for various i.MX8MP blk-ctrl devices.
- Enable VPU PGC, blk-ctrl and PCIe support for i.MX8MP SoC.
- A set of changes from Peng Fan to add various devices for i.MX93 SoC,
  including MU, blk-ctrl, PMU, LPI2C, LPSPI, SRC, etc.
- Two set of changes to update LS1043A and LS1046A device trees on
  various aspects, including USB3, PCIe, DMA, mdio-mux, QSPI Flash, etc.
- Board imx8mq-librem5 update: add USB role switching, add RGB PWM
  notification LEDs, add voice coil motor for focus control, fix MIPI_CSI
  description.
- A series from Frieder Schrempf to improve imx8mm-kontron device trees
  for VSELECT switch, DDRC operating point, SPI NOR partition layout etc.
- A set of display and PMIC related additions and improvements on
  imx8mm-verdin board.
- A number of i.MX8M Plus DHCOM PDK2 device tree improvments from Marek
  Vasut.
- A few imx8mp-venice device tree updates on USB, cpufreq and WiFi/BT.
- A series from Vladimir Oltean to enable multiple switch CPU ports
  support.
- Other small and random board specific updates.

* tag 'imx-dt64-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (90 commits)
  arm64: dts: ls1046a-qds: Modify the qspi flash frequency
  arm64: dts: ls1046a-qds: add mmio based mdio-mux nodes for FPGA
  arm64: dts: ls1046a: add gpios based i2c recovery information
  arm64: dts: ls1046a: use a pseudo-bus to constrain usb and sata dma size
  arm64: dts: ls1046a: make dma-coherent global to the SoC
  arm64: dts: ls1046a: add missing dma ranges property
  arm64: dts: ls1046a: Add big-endian property for PCIe nodes
  arm64: dts: ls1046a: Add the PME interrupt and big-endian to PCIe EP nodes
  arm64: dts: ls1046a: Enable usb3-lpm-capable for usb3 node
  arm64: dts: ls1043a-rdb: add pcf85263 rtc node
  arm64: dts: ls1043a-qds: add mmio based mdio-mux support
  arm64: dts: ls1043a: use a pseudo-bus to constrain usb and sata dma size
  arm64: dts: ls1043a: add gpio based i2c recovery information
  arm64: dts: ls1043a: make dma-coherent global to the SoC
  arm64: dts: ls1043a: add missing dma ranges property
  arm64: dts: ls1043a: Add big-endian property for PCIe nodes
  arm64: dts: ls1043a: Add SCFG phandle for PCIe nodes
  arm64: dts: ls1043a: use pcie aer/pme interrupts
  arm64: dts: ls1043a: Enable usb3-lpm-capable for usb3 node
  arm64: dts: ls1043a: fix the wrong size of dcfg space
  ...

Link: https://lore.kernel.org/r/20220918092806.2152700-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index e9f0cdd10ab6..19eaa523564d 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -534,7 +534,7 @@
 				status = "disabled";
 			};
 
-			sdma2: sdma@302c0000 {
+			sdma2: dma-controller@302c0000 {
 				compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma";
 				reg = <0x302c0000 0x10000>;
 				interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
@@ -1302,7 +1302,7 @@
 				status = "disabled";
 			};
 
-			sdma1: sdma@30bd0000 {
+			sdma1: dma-controller@30bd0000 {
 				compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma";
 				reg = <0x30bd0000 0x10000>;
 				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;