Skip to content

Commit 325ba85

Browse files
committed
drm/i2c: move TDA998x driver under drivers/gpu/drm/bridge
TDA998x is the HDMI bridge driver, incorporating drm_connector and optional drm_encoder (created via the component bind API by the TICLDC and HDLCD drivers). Thus it should be residing together with the other DRM bridge drivers under drivers/gpu/drm/bridge/. Acked-by: Neil Armstrong <[email protected]> Acked-by: Liviu Dudau <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent caa6f4a commit 325ba85

File tree

8 files changed

+14
-19
lines changed

8 files changed

+14
-19
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17080,7 +17080,7 @@ M: Russell King <[email protected]>
1708017080
S: Maintained
1708117081
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
1708217082
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
17083-
F: drivers/gpu/drm/i2c/tda998x_drv.c
17083+
F: drivers/gpu/drm/bridge/tda998x_drv.c
1708417084
F: include/dt-bindings/display/tda998x.h
1708517085
K: "nxp,tda998x"
1708617086

drivers/gpu/drm/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,6 @@ config DRM_SCHED
326326
tristate
327327
depends on DRM
328328

329-
source "drivers/gpu/drm/i2c/Kconfig"
330-
331329
source "drivers/gpu/drm/arm/Kconfig"
332330

333331
source "drivers/gpu/drm/radeon/Kconfig"

drivers/gpu/drm/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ config DRM_HDLCD
99
select DRM_CLIENT_SELECTION
1010
select DRM_KMS_HELPER
1111
select DRM_GEM_DMA_HELPER
12+
select DRM_BRIDGE # for TDA998x
1213
help
1314
Choose this option if you have an ARM High Definition Colour LCD
1415
controller.

drivers/gpu/drm/bridge/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ config DRM_FSL_LDB
9090
help
9191
Support for i.MX8MP DPI-to-LVDS on-SoC encoder.
9292

93+
config DRM_I2C_NXP_TDA998X
94+
tristate "NXP Semiconductors TDA998X HDMI encoder"
95+
default m if DRM_TILCDC
96+
select CEC_CORE if CEC_NOTIFIER
97+
select SND_SOC_HDMI_CODEC if SND_SOC
98+
help
99+
Support for NXP Semiconductors TDA998X HDMI encoders.
100+
93101
config DRM_ITE_IT6263
94102
tristate "ITE IT6263 LVDS/HDMI bridge"
95103
depends on OF

drivers/gpu/drm/bridge/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ obj-$(CONFIG_DRM_CHRONTEL_CH7033) += chrontel-ch7033.o
66
obj-$(CONFIG_DRM_CROS_EC_ANX7688) += cros-ec-anx7688.o
77
obj-$(CONFIG_DRM_DISPLAY_CONNECTOR) += display-connector.o
88
obj-$(CONFIG_DRM_FSL_LDB) += fsl-ldb.o
9+
10+
tda998x-y := tda998x_drv.o
11+
obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o
12+
913
obj-$(CONFIG_DRM_ITE_IT6263) += ite-it6263.o
1014
obj-$(CONFIG_DRM_ITE_IT6505) += ite-it6505.o
1115
obj-$(CONFIG_DRM_LONTIUM_LT8912B) += lontium-lt8912b.o
File renamed without changes.

drivers/gpu/drm/i2c/Kconfig

Lines changed: 0 additions & 13 deletions
This file was deleted.

drivers/gpu/drm/i2c/Makefile

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)