Merge tag 'imx-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt

i.MX ARM device tree for 6.5:

- New board support: Marantec Maveo Box.
- Add HDMI support for TQMa6x/MBa6 board.
- A series from Andrew Lunn to add phy-mode and fixed links for Ethernet
  devices on imx51, imx6qdl and vf610.
- A bunch of changes from Fabio Estevam to clean up deprecated and
  invalid properies, fix up node names to remove dt-schema warnings.
- A series of maintenance updates for Protonic Holland boards, mostly
  on the USB subsystem configuration, thermal zones, and the naming of
  GPIO keys.
- Update dma-apbh device node name to remove dtbs_check warnings.
- Remove invalid nodes from fan-controller for a couple of Gateworks
  boards.
- Small random updates and clean-ups on various boards.

* tag 'imx-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits)
  ARM: dts: imx6qdl: vicut1: rename power to power-button
  ARM: dts: imx6dl: prtrvt, prtvt7, prti6q, prtwd2: fix USB related warnings
  ARM: dts: imx6dl: plybas: fix USB over-current detection on USB OTG port
  ARM: dts: imx6ul: prti6g: fix USB over-current detection on USB OTG port
  ARM: dts: imx6qp: prtwd3: Enable USB over current detection on USB OTG port
  ARM: dts: imx6dl: prtmvt: fix different USB related warnings
  ARM: dts: imx6dl: alti6p: fix different USB related warnings
  ARM: dts: imx6dl: vicut1: Address USB related warnings
  ARM: dts: imx6dl: Add trip points to thermal zones on several devices
  ARM: dts: imx6dl: lanmcu: Configure over-current polarity for USB OTG node
  ARM: dts: imx6dl: lanmcu: Disable unused USB PHY nodes
  ARM: dts: imx6q: prtwd2: Correct iomux configuration for ENET MDIO and MDC
  ARM: dts: imx6dl: prtvt7: Remove touchscreen inversion
  ARM: dts: imx6dl: prtvt7: Adjust default backlight brightness to 65
  ARM: dts: imx6qdl: vicut1: The sgtl5000 uses i2s not ac97
  ARM: dts: imx: Use 'eeprom' as node name
  ARM: dts: imx6ul-ccimx6ulsom: Fix the "coin" regulator name
  ARM: dts: imx: Use 'pmic' as node name
  ARM: dts: imx6: Use the mux- prefix
  ARM: dts: imx7d-sdb: Allow UHS modes
  ...

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

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/imx6dl-qmx6.dtsi b/arch/arm/boot/dts/imx6dl-qmx6.dtsi
index 150d69858255..05fd8ff4da1e 100644
--- a/arch/arm/boot/dts/imx6dl-qmx6.dtsi
+++ b/arch/arm/boot/dts/imx6dl-qmx6.dtsi
@@ -48,7 +48,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_audmux>;
 
-	audmux_ssi1 {
+	mux-ssi1 {
 		fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
 		fsl,port-config = <
 			(IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -60,7 +60,7 @@
 		>;
 	};
 
-	audmux_aud6 {
+	mux-aud6 {
 		fsl,audmux-port = <MX51_AUDMUX_PORT6>;
 		fsl,port-config = <
 			IMX_AUDMUX_V2_PTCR_SYN