[PATCH] drm/bridge: Move mhl.h into driver directory

Daniel Vetter daniel.vetter at ffwll.ch
Wed Apr 15 17:38:33 UTC 2020


include/drm/bridge is a bit a mistake, drivers are supposed to find
their bridges using one of the standard of_* functions the drm_bridge
core provides. dw-hdmi and analogix-dp are the only, historically
grown exception that we haven't managed to get rid of yet.

Make sure that at least no new ones grow by moving hardware header
files into the correct driver directory.

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Cc: Alexey Brodkin <abrodkin at synopsys.com>
Cc: Sam Ravnborg <sam at ravnborg.org>
Cc: Andrzej Hajda <a.hajda at samsung.com>
Cc: Neil Armstrong <narmstrong at baylibre.com>
Cc: Laurent Pinchart <Laurent.pinchart at ideasonboard.com>
Cc: Jonas Karlman <jonas at kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec at siol.net>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Kate Stewart <kstewart at linuxfoundation.org>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Allison Randal <allison at lohutok.net>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: "Gustavo A. R. Silva" <gustavo at embeddedor.com>
---
 {include => drivers/gpu}/drm/bridge/mhl.h | 0
 drivers/gpu/drm/bridge/sii9234.c          | 3 ++-
 drivers/gpu/drm/bridge/sil-sii8620.c      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename {include => drivers/gpu}/drm/bridge/mhl.h (100%)

diff --git a/include/drm/bridge/mhl.h b/drivers/gpu/drm/bridge/mhl.h
similarity index 100%
rename from include/drm/bridge/mhl.h
rename to drivers/gpu/drm/bridge/mhl.h
diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c
index b1258f0ed205..4c862c3af038 100644
--- a/drivers/gpu/drm/bridge/sii9234.c
+++ b/drivers/gpu/drm/bridge/sii9234.c
@@ -12,7 +12,6 @@
  *    Shankar Bandal <shankar.b at samsung.com>
  *    Dharam Kumar <dharam.kr at samsung.com>
  */
-#include <drm/bridge/mhl.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
@@ -29,6 +28,8 @@
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
+#include "mhl.h"
+
 #define CBUS_DEVCAP_OFFSET		0x80
 
 #define SII9234_MHL_VERSION		0x11
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index 92acd336aa89..017dbb67404e 100644
--- a/drivers/gpu/drm/bridge/sil-sii8620.c
+++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -8,7 +8,6 @@
 
 #include <asm/unaligned.h>
 
-#include <drm/bridge/mhl.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
@@ -31,6 +30,7 @@
 
 #include <media/rc-core.h>
 
+#include "mhl.h"
 #include "sil-sii8620.h"
 
 #define SII8620_BURST_BUF_LEN 288
-- 
2.25.1



More information about the dri-devel mailing list