diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index 74958061be46..815fd2a1881e 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -244,7 +244,6 @@ device		vt
 device		kbdmux
 device		ums
 device		videomode
-device		hdmi
 device		vchiq
 
 # IMX6 HDMI Controller
diff --git a/sys/arm/freescale/imx/imx6_hdmi.c b/sys/arm/freescale/imx/imx6_hdmi.c
index 28a62a66fd01..f5b4a2ab0ac5 100644
--- a/sys/arm/freescale/imx/imx6_hdmi.c
+++ b/sys/arm/freescale/imx/imx6_hdmi.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/hdmi/dwc_hdmi.h>
 
-#include "hdmi_if.h"
+#include "crtc_if.h"
 
 struct imx_hdmi_softc {
 	struct dwc_hdmi_softc	base;
@@ -200,9 +200,9 @@ static device_method_t imx_hdmi_methods[] = {
 	DEVMETHOD(device_attach, imx_hdmi_attach),
 	DEVMETHOD(device_detach, imx_hdmi_detach),
 
-	/* HDMI methods */
-	DEVMETHOD(hdmi_get_edid,	dwc_hdmi_get_edid),
-	DEVMETHOD(hdmi_set_videomode,	dwc_hdmi_set_videomode),
+	/* CRTC methods */
+	DEVMETHOD(crtc_get_edid,	dwc_hdmi_get_edid),
+	DEVMETHOD(crtc_set_videomode,	dwc_hdmi_set_videomode),
 
 	DEVMETHOD_END
 };
diff --git a/sys/arm/freescale/imx/imx6_ipu.c b/sys/arm/freescale/imx/imx6_ipu.c
index be9487620a06..02bfbe8e0049 100644
--- a/sys/arm/freescale/imx/imx6_ipu.c
+++ b/sys/arm/freescale/imx/imx6_ipu.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/freescale/imx/imx_ccmvar.h>
 
 #include "fb_if.h"
-#include "hdmi_if.h"
+#include "crtc_if.h"
 
 static int have_ipu = 0;
 
@@ -1120,7 +1120,7 @@ ipu_hdmi_event(void *arg, device_t hdmi_dev)
 
 	edid = NULL;
 	edid_len = 0;
-	if (HDMI_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) {
+	if (CRTC_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) {
 		device_printf(sc->sc_dev, "failed to get EDID info from HDMI framer\n");
 	}
 
@@ -1150,7 +1150,7 @@ ipu_hdmi_event(void *arg, device_t hdmi_dev)
 
 	ipu_init(sc);
 
-	HDMI_SET_VIDEOMODE(hdmi_dev, sc->sc_mode);
+	CRTC_SET_VIDEOMODE(hdmi_dev, sc->sc_mode);
 }
 
 static int
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index 06563a476a3c..34f46613afac 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 #include "am335x_pwm.h"
 
 #include "fb_if.h"
-#include "hdmi_if.h"
+#include "crtc_if.h"
 
 #define	LCD_PID			0x00
 #define	LCD_CTRL		0x04
@@ -871,7 +871,7 @@ am335x_lcd_hdmi_event(void *arg, device_t hdmi, int event)
 
 	edid = NULL;
 	edid_len = 0;
-	if (HDMI_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) {
+	if (CRTC_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) {
 		device_printf(sc->sc_dev, "failed to get EDID info from HDMI framer\n");
 		return;
 	}
@@ -925,7 +925,7 @@ am335x_lcd_hdmi_event(void *arg, device_t hdmi, int event)
 	hdmi_mode.hskew = videomode->hsync_end - videomode->hsync_start;
 	hdmi_mode.flags |= VID_HSKEW;
 
-	HDMI_SET_VIDEOMODE(hdmi_dev, &hdmi_mode);
+	CRTC_SET_VIDEOMODE(hdmi_dev, &hdmi_mode);
 }
 
 static int
diff --git a/sys/arm/ti/am335x/tda19988.c b/sys/arm/ti/am335x/tda19988.c
index 8f3a626b7c42..ff3f374a9bcd 100644
--- a/sys/arm/ti/am335x/tda19988.c
+++ b/sys/arm/ti/am335x/tda19988.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/videomode/edidvar.h>
 
 #include "iicbus_if.h"
-#include "hdmi_if.h"
+#include "crtc_if.h"
 
 #define	MKREG(page, addr)	(((page) << 8) | (addr))
 
@@ -782,9 +782,9 @@ static device_method_t tda_methods[] = {
 	DEVMETHOD(device_attach,	tda19988_attach),
 	DEVMETHOD(device_detach,	tda19988_detach),
 
-	/* HDMI methods */
-	DEVMETHOD(hdmi_get_edid,	tda19988_get_edid),
-	DEVMETHOD(hdmi_set_videomode,	tda19988_set_videomode),
+	/* CRTC methods */
+	DEVMETHOD(crtc_get_edid,	tda19988_get_edid),
+	DEVMETHOD(crtc_set_videomode,	tda19988_set_videomode),
 	{0, 0},
 };
 
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index de7dfdffa591..d236c083cc43 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -86,7 +86,7 @@ dev/dwc/if_dwc.c		optional	dwc
 dev/dwc/if_dwc_if.m		optional	dwc
 dev/fb/fb.c			optional	sc
 dev/fdt/fdt_arm_platform.c	optional	platform fdt
-dev/hdmi/hdmi_if.m		optional	hdmi
+dev/video/crtc_if.m		optional	vt
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
 dev/hwpmc/hwpmc_armv7.c		optional	hwpmc
 dev/iicbus/twsi/twsi.c		optional	twsi
diff --git a/sys/dev/hdmi/dwc_hdmi.c b/sys/dev/hdmi/dwc_hdmi.c
index 0f1388874292..52b0045a00ee 100644
--- a/sys/dev/hdmi/dwc_hdmi.c
+++ b/sys/dev/hdmi/dwc_hdmi.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hdmi/dwc_hdmi.h>
 #include <dev/hdmi/dwc_hdmireg.h>
 
-#include "hdmi_if.h"
+#include "crtc_if.h"
 
 #define	I2C_DDC_ADDR	(0x50 << 1)
 #define	I2C_DDC_SEGADDR	(0x30 << 1)
diff --git a/sys/dev/hdmi/dwc_hdmi_fdt.c b/sys/dev/hdmi/dwc_hdmi_fdt.c
index 4486e83f1a73..810a1f53e2dc 100644
--- a/sys/dev/hdmi/dwc_hdmi_fdt.c
+++ b/sys/dev/hdmi/dwc_hdmi_fdt.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/hdmi/dwc_hdmi.h>
 
-#include "hdmi_if.h"
+#include "crtc_if.h"
 
 struct dwc_hdmi_fdt_softc {
 	struct dwc_hdmi_softc	base;
diff --git a/sys/dev/hdmi/hdmi_if.m b/sys/dev/video/crtc_if.m
similarity index 99%
rename from sys/dev/hdmi/hdmi_if.m
rename to sys/dev/video/crtc_if.m
index 81dbfa2009bb..8cf81bccccf9 100644
--- a/sys/dev/hdmi/hdmi_if.m
+++ b/sys/dev/video/crtc_if.m
@@ -30,7 +30,7 @@
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/edidvar.h>
 
-INTERFACE hdmi;
+INTERFACE crtc;
 
 HEADER {
 	#include <sys/eventhandler.h>