Place Tegra124 SOR and eDP implenetation into common Tegra driver folder until it is integrated into existing setup.
Signed-off-by: Svyatoslav Ryhel <[email protected]> --- drivers/video/Kconfig | 8 -------- drivers/video/Makefile | 1 - drivers/video/tegra/Kconfig | 8 ++++++++ drivers/video/tegra/Makefile | 2 ++ drivers/video/tegra/TODO | 5 +++++ drivers/video/{ => tegra}/tegra124/Makefile | 0 drivers/video/{ => tegra}/tegra124/display.c | 0 drivers/video/{ => tegra}/tegra124/displayport.h | 0 drivers/video/{ => tegra}/tegra124/dp.c | 0 drivers/video/{ => tegra}/tegra124/sor.c | 0 drivers/video/{ => tegra}/tegra124/sor.h | 0 11 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 drivers/video/tegra/TODO rename drivers/video/{ => tegra}/tegra124/Makefile (100%) rename drivers/video/{ => tegra}/tegra124/display.c (100%) rename drivers/video/{ => tegra}/tegra124/displayport.h (100%) rename drivers/video/{ => tegra}/tegra124/dp.c (100%) rename drivers/video/{ => tegra}/tegra124/sor.c (100%) rename drivers/video/{ => tegra}/tegra124/sor.h (100%) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index afcdb16c599..d343dfb061b 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -809,14 +809,6 @@ source "drivers/video/stm32/Kconfig" source "drivers/video/tidss/Kconfig" -config VIDEO_TEGRA124 - bool "Enable video support on Tegra124" - help - Tegra124 supports many video output options including eDP and - HDMI. At present only eDP is supported by U-Boot. This option - enables this support which can be used on devices which - have an eDP display connected. - source "drivers/video/bridge/Kconfig" source "drivers/video/tegra/Kconfig" diff --git a/drivers/video/Makefile b/drivers/video/Makefile index f506f4ba050..fec58bd8283 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -34,7 +34,6 @@ obj-$(CONFIG_BACKLIGHT_LP855x) += lp855x_backlight.o obj-${CONFIG_EXYNOS_FB} += exynos/ obj-${CONFIG_VIDEO_ROCKCHIP} += rockchip/ obj-${CONFIG_VIDEO_STM32} += stm32/ -obj-${CONFIG_VIDEO_TEGRA124} += tegra124/ obj-${CONFIG_$(XPL_)VIDEO_TIDSS} += tidss/ obj-y += ti/ diff --git a/drivers/video/tegra/Kconfig b/drivers/video/tegra/Kconfig index 598f9ea1f21..3d610036a1f 100644 --- a/drivers/video/tegra/Kconfig +++ b/drivers/video/tegra/Kconfig @@ -36,3 +36,11 @@ config TEGRA_BACKLIGHT_PWM select VIDEO_TEGRA20 help Tegra DC dependent backlight. + +config VIDEO_TEGRA124 + bool "Enable video support on Tegra124" + help + Tegra124 supports many video output options including eDP and + HDMI. At present only eDP is supported by U-Boot. This option + enables this support which can be used on devices which + have an eDP display connected. diff --git a/drivers/video/tegra/Makefile b/drivers/video/tegra/Makefile index 78521405749..cd4cf72b3e5 100644 --- a/drivers/video/tegra/Makefile +++ b/drivers/video/tegra/Makefile @@ -5,3 +5,5 @@ obj-$(CONFIG_VIDEO_TEGRA20) += tegra-dc.o obj-$(CONFIG_VIDEO_DSI_TEGRA30) += tegra-dsi.o tegra-mipi.o mipi-phy.o obj-$(CONFIG_VIDEO_HDMI_TEGRA) += tegra-hdmi.o obj-$(CONFIG_TEGRA_BACKLIGHT_PWM) += tegra-pwm-backlight.o + +obj-${CONFIG_VIDEO_TEGRA124} += tegra124/ diff --git a/drivers/video/tegra/TODO b/drivers/video/tegra/TODO new file mode 100644 index 00000000000..1c8c2389a18 --- /dev/null +++ b/drivers/video/tegra/TODO @@ -0,0 +1,5 @@ +Existence of separate Tegra124 video implementations is not an ideal solution +since generic video setup for Tegra already has Tegra124 support of some degree. +It is not possible at the time of this note is written to integrate T124 SOR +and DP without possible regressions. Tegra124 setup for SOR and DP should be +incorporated into existing setup once such opportunity occurs. diff --git a/drivers/video/tegra124/Makefile b/drivers/video/tegra/tegra124/Makefile similarity index 100% rename from drivers/video/tegra124/Makefile rename to drivers/video/tegra/tegra124/Makefile diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra/tegra124/display.c similarity index 100% rename from drivers/video/tegra124/display.c rename to drivers/video/tegra/tegra124/display.c diff --git a/drivers/video/tegra124/displayport.h b/drivers/video/tegra/tegra124/displayport.h similarity index 100% rename from drivers/video/tegra124/displayport.h rename to drivers/video/tegra/tegra124/displayport.h diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra/tegra124/dp.c similarity index 100% rename from drivers/video/tegra124/dp.c rename to drivers/video/tegra/tegra124/dp.c diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra/tegra124/sor.c similarity index 100% rename from drivers/video/tegra124/sor.c rename to drivers/video/tegra/tegra124/sor.c diff --git a/drivers/video/tegra124/sor.h b/drivers/video/tegra/tegra124/sor.h similarity index 100% rename from drivers/video/tegra124/sor.h rename to drivers/video/tegra/tegra124/sor.h -- 2.43.0
