git: 8574d32f226a - main - arm: imx: Rename video related devices

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=8574d32f226a5fc5b3d453d46745a8681ddbb465

commit 8574d32f226a5fc5b3d453d46745a8681ddbb465
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-03-16 09:30:57 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-03-17 12:34:46 +0000

    arm: imx: Rename video related devices
    
    device 'hdmi' is too generic (and will be used later in a new device) so rename
    the arm IMX devices to some proper name.
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Reviewed by:    andrew
    Differential Revision:  https://reviews.freebsd.org/D39118
---
 sys/arm/conf/GENERIC             | 5 +++++
 sys/arm/freescale/imx/files.imx6 | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index 84f81a2f142c..024ff2a13ab4 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -247,6 +247,11 @@ device		videomode
 device		hdmi
 device		vchiq
 
+# IMX6 HDMI Controller
+device		dwc_hdmi
+device		imx6_hdmi
+device		imx6_ipu
+
 # Pinmux
 device		fdt_pinctrl
 
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index 926c2b25f4b9..2cf2524d2ae5 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -23,10 +23,10 @@ arm/freescale/imx/imx6_audmux.c		optional sound
 arm/freescale/imx/imx6_ssi.c		optional sound fslsdma
 arm/freescale/imx/imx6_ahci.c		optional ahci
 
-dev/hdmi/dwc_hdmi.c			optional hdmi
-arm/freescale/imx/imx6_hdmi.c		optional hdmi
+dev/hdmi/dwc_hdmi.c			optional vt dwc_hdmi
+arm/freescale/imx/imx6_hdmi.c		optional vt imx6_hdmi
 
-arm/freescale/imx/imx6_ipu.c		optional	vt
+arm/freescale/imx/imx6_ipu.c		optional vt imx6_ipu
 
 #
 # Optional devices.