From ea64fc334c97ff8d15037bf9941d735d16272aff Mon Sep 17 00:00:00 2001
From: YoungSoo Shin <shinys000114@gmail.com>
Date: Tue, 2 Jun 2026 16:16:53 +0900
Subject: [PATCH] Revert "ODROID-COMMON: drm/hdmitx: add support custom display
 timing from device tree"

This reverts commit 7c13bbb7e10a5f3c60b31116e9e9b84337e20502.

Change-Id: I97381ebe92de00c0edd079a3f107dd4cc82ff4d2
---
 drivers/drm/Kconfig            |  5 -----
 drivers/drm/Makefile           |  3 ---
 drivers/drm/meson_hdmi.c       |  6 ------
 drivers/drm/odroid_helper.c    |  1 -
 drivers/drm/odroid_helper.h    |  2 --
 drivers/drm/odroid_helper_dt.c | 33 ---------------------------------
 6 files changed, 50 deletions(-)
 delete mode 100644 drivers/drm/odroid_helper_dt.c

diff --git a/drivers/drm/Kconfig b/drivers/drm/Kconfig
index a52b1da05..b25a71764 100644
--- a/drivers/drm/Kconfig
+++ b/drivers/drm/Kconfig
@@ -128,9 +128,4 @@ config ODROID_CUSTOM_DISPLAY_MODES_CMDLINE
 	bool "Custom display modes from kernel command line"
 	default n
 	select ODROID_CUSTOM_DISPLAY_MODES
-config ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE
-	bool "Load custom display mode from device tree"
-	default n
-	select ODROID_CUSTOM_DISPLAY_MODES
-
 endif
diff --git a/drivers/drm/Makefile b/drivers/drm/Makefile
index 23dca791b..22bc05202 100644
--- a/drivers/drm/Makefile
+++ b/drivers/drm/Makefile
@@ -87,7 +87,4 @@ endif
 ifneq ($(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_CMDLINE),)
 	$(MESON_DRM_MODULE_NAME)-y += odroid_helper_cmdline.o
 endif
-ifneq ($(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE),)
-	$(MESON_DRM_MODULE_NAME)-y += odroid_helper_dt.o
-endif
 endif
diff --git a/drivers/drm/meson_hdmi.c b/drivers/drm/meson_hdmi.c
index eedbe47c9..d2b035c6d 100644
--- a/drivers/drm/meson_hdmi.c
+++ b/drivers/drm/meson_hdmi.c
@@ -544,9 +544,6 @@ int meson_hdmitx_get_modes(struct drm_connector *connector)
 	int *tmp;
 	int num_group = 0;
 	u64 sequence_id = 0;
-#if defined(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE)
-	struct device *dev = connector->dev->dev;
-#endif
 
 	if (!connector) {
 		DRM_ERROR("connector is NULL!\n");
@@ -650,9 +647,6 @@ int meson_hdmitx_get_modes(struct drm_connector *connector)
 #if defined(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_CMDLINE)
 	count += load_odroid_modeline_from_commandline(connector);
 #endif
-#if defined(CONFIG_ODROID_CUSTOM_DISPLAY_MODES_DEVICETREE)
-	count += load_odroid_display_mode_from_dt(connector, dev->of_node);
-#endif
 
 	connector->display_info.monitor_range.max_vfreq = am_hdmitx->max_vfreq;
 	connector->display_info.monitor_range.min_vfreq = am_hdmitx->min_vfreq;
diff --git a/drivers/drm/odroid_helper.c b/drivers/drm/odroid_helper.c
index 5fac5d145..410c78ded 100644
--- a/drivers/drm/odroid_helper.c
+++ b/drivers/drm/odroid_helper.c
@@ -1,6 +1,5 @@
 #include <linux/fs.h>
 #include <linux/gcd.h>
-#include <video/display_timing.h>
 
 #include "odroid_helper.h"
 
diff --git a/drivers/drm/odroid_helper.h b/drivers/drm/odroid_helper.h
index 912454195..00685b056 100644
--- a/drivers/drm/odroid_helper.h
+++ b/drivers/drm/odroid_helper.h
@@ -17,6 +17,4 @@ extern int update_odroid_custom_hdmi_timing(
 
 extern int load_odroid_modelines(struct drm_connector *connector);
 extern int load_odroid_modeline_from_commandline(struct drm_connector *connector);
-extern int load_odroid_display_mode_from_dt(struct drm_connector *connector,
-		struct device_node *node);
 #endif
diff --git a/drivers/drm/odroid_helper_dt.c b/drivers/drm/odroid_helper_dt.c
deleted file mode 100644
index ba2aad1c7..000000000
--- a/drivers/drm/odroid_helper_dt.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <video/of_display_timing.h>
-#include <video/videomode.h>
-
-#include "odroid_helper.h"
-
-int load_odroid_display_mode_from_dt(struct drm_connector *connector,
-		struct device_node *node)
-{
-	struct display_timings *disp = of_get_display_timings(node);
-	int i;
-	int count = 0;
-
-	if (!disp)
-		return 0;
-
-	for (i = 0; i < disp->num_timings; i++) {
-		struct drm_display_mode mode;
-		int ret;
-		ret = of_get_drm_display_mode(node, &mode, NULL, i);
-		if (ret)
-			continue;
-
-		mode.type = DRM_MODE_TYPE_USERDEF;
-		mode.hskew = 0;
-		mode.vscan = 0;
-
-		ret = append_replace_drm_display_mode(connector, &mode);
-		if (ret == 0)
-			count++;
-	}
-
-	return count;
-}