MLK-24427-1: drm: gpu: imx: Move cdns driver files to mhdp folder

Move cdns hdmi/dp files to mhdp folder. Rename files from cdn-* to cdns-* Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> Reviewed-by: Robby Cai <robby.cai@nxp.com>
Freescale · Jul 24, 2020 · c3bb7b79d985949d292d9057004fa606a1831bcc · c3bb7b7
1 parent 85b5c8c
commit c3bb7b79d985949d292d9057004fa606a1831bcc
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 17 deletions.
diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig
@@ -111,18 +111,9 @@ config DRM_IMX_SEC_DSIM
 	  Choose this to enable the internal SEC MIPI DSIM controller
 	  found on i.MX platform.
 
-config DRM_IMX_CDNS_MHDP
-	tristate "NXP i.MX MX8 DRM HDMI/DP"
-	select DRM_CDNS_MHDP
-	select DRM_CDNS_DP
-	select DRM_CDNS_HDMI
-	select DRM_CDNS_AUDIO
-	depends on DRM_IMX
-	help
-	  Choose this if you want to use HDMI on i.MX8.
-
 source "drivers/gpu/drm/imx/dpu/Kconfig"
 source "drivers/gpu/drm/imx/ipuv3/Kconfig"
 source "drivers/gpu/drm/imx/lcdif/Kconfig"
 source "drivers/gpu/drm/imx/lcdifv3/Kconfig"
 source "drivers/gpu/drm/imx/dcss/Kconfig"
+source "drivers/gpu/drm/imx/mhdp/Kconfig"
diff --git a/drivers/gpu/drm/imx/Makefile b/drivers/gpu/drm/imx/Makefile
@@ -20,6 +20,4 @@ obj-$(CONFIG_DRM_IMX_LCDIF) += lcdif/
 obj-$(CONFIG_DRM_IMX_LCDIFV3) += lcdifv3/
 obj-$(CONFIG_DRM_IMX_SEC_DSIM) += sec_mipi_dsim-imx.o
 obj-$(CONFIG_DRM_IMX_DCSS) += dcss/
-
-cdns_mhdp_imx-objs := cdn-mhdp-imxdrv.o cdn-mhdp-dp-phy.o cdn-mhdp-hdmi-phy.o cdn-mhdp-imx8qm.o cdn-mhdp-ls1028a.o
-obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdns_mhdp_imx.o
+obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += mhdp/
diff --git a/drivers/gpu/drm/imx/mhdp/Kconfig b/drivers/gpu/drm/imx/mhdp/Kconfig
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config DRM_IMX_CDNS_MHDP
+	tristate "NXP i.MX MX8 DRM HDMI/DP"
+	select DRM_CDNS_MHDP
+	select DRM_CDNS_DP
+	select DRM_CDNS_HDMI
+	select DRM_CDNS_AUDIO
+	depends on DRM_IMX
+	help
+	  Choose this if you want to use HDMI on i.MX8.
diff --git a/drivers/gpu/drm/imx/mhdp/Makefile b/drivers/gpu/drm/imx/mhdp/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+cdns_mhdp_imx-objs := cdns-mhdp-imxdrv.o cdns-mhdp-dp-phy.o \
+		cdns-mhdp-hdmi-phy.o cdns-mhdp-imx8qm.o cdns-mhdp-ls1028a.o
+obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdns_mhdp_imx.o
diff --git a/drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-dp-phy.c b/drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-dp-phy.c
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <drm/drm_dp_helper.h>
 #include <drm/bridge/cdns-mhdp-common.h>
-#include "cdn-mhdp-phy.h"
+#include "cdns-mhdp-phy.h"
 
 enum dp_link_rate {
 	RATE_1_6 = 162000,

diff --git a/drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c → ...ers/gpu/drm/imx/mhdp/cdns-mhdp-hdmi-phy.c b/drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c → ...ers/gpu/drm/imx/mhdp/cdns-mhdp-hdmi-phy.c
@@ -19,7 +19,7 @@
 #include <linux/io.h>
 
 #include <drm/bridge/cdns-mhdp-common.h>
-#include "cdn-mhdp-phy.h"
+#include "cdns-mhdp-phy.h"
 
 /* HDMI TX clock control settings */
 struct hdmi_ctrl {

diff --git a/drivers/gpu/drm/imx/cdns-mhdp-imx.h → drivers/gpu/drm/imx/mhdp/cdns-mhdp-imx.h b/drivers/gpu/drm/imx/cdns-mhdp-imx.h → drivers/gpu/drm/imx/mhdp/cdns-mhdp-imx.h
diff --git a/drivers/gpu/drm/imx/cdn-mhdp-imx8qm.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-imx8qm.c b/drivers/gpu/drm/imx/cdn-mhdp-imx8qm.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-imx8qm.c
diff --git a/drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-imxdrv.c b/drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-imxdrv.c
@@ -14,8 +14,8 @@
 #include <drm/drm_encoder_slave.h>
 
 #include "cdns-mhdp-imx.h"
-#include "cdn-mhdp-phy.h"
-#include "imx-drm.h"
+#include "cdns-mhdp-phy.h"
+#include "../imx-drm.h"
 
 static void cdns_mhdp_imx_encoder_disable(struct drm_encoder *encoder)
 {

diff --git a/drivers/gpu/drm/imx/cdn-mhdp-ls1028a.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-ls1028a.c b/drivers/gpu/drm/imx/cdn-mhdp-ls1028a.c → drivers/gpu/drm/imx/mhdp/cdns-mhdp-ls1028a.c
diff --git a/drivers/gpu/drm/imx/cdn-mhdp-phy.h → drivers/gpu/drm/imx/mhdp/cdns-mhdp-phy.h b/drivers/gpu/drm/imx/cdn-mhdp-phy.h → drivers/gpu/drm/imx/mhdp/cdns-mhdp-phy.h