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@xxxxxxxxx>
Cc: Alexey Brodkin <abrodkin@xxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Andrzej Hajda <a.hajda@xxxxxxxxxxx>
Cc: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
Cc: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx>
Cc: Jonas Karlman <jonas@xxxxxxxxx>
Cc: Jernej Skrabec <jernej.skrabec@xxxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Cc: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Allison Randal <allison@xxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: "Gustavo A. R. Silva" <gustavo@xxxxxxxxxxxxxx>
---
{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@xxxxxxxxxxx>
* Dharam Kumar <dharam.kr@xxxxxxxxxxx>
*/
-#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
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
