video: tegra: adjust DC and DSI config names

Fix DC and DSI config names to reflect more generic nature of existing
Tegra video drivers.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 6425fa8..d432fd2 100644 (file)
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -147,7 +147,7 @@ void pin_mux_usb(void)
 }
 #endif
 
-#ifdef CONFIG_VIDEO_TEGRA20
+#ifdef CONFIG_VIDEO_TEGRA
 /*
  * Routine: pin_mux_display
  * Description: setup the pin muxes/tristate values for the LCD interface)

diff --git a/configs/endeavoru_defconfig b/configs/endeavoru_defconfig
index fb3d7fc..c85994b 100644 (file)
--- a/configs/endeavoru_defconfig
+++ b/configs/endeavoru_defconfig
@@ -83,5 +83,5 @@ CONFIG_VIDEO=y
 CONFIG_VIDEO_BRIDGE=y
 # CONFIG_VIDEO_LOGO is not set
 CONFIG_VIDEO_LCD_ENDEAVORU=y
-CONFIG_VIDEO_DSI_TEGRA30=y
+CONFIG_VIDEO_DSI_TEGRA=y
 CONFIG_TEGRA_BACKLIGHT_PWM=y

diff --git a/configs/grouper_defconfig b/configs/grouper_defconfig
index b98f23a..016fc60 100644 (file)
--- a/configs/grouper_defconfig
+++ b/configs/grouper_defconfig
@@ -88,4 +88,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4e41
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index fa8fe24..9fa9c12 100644 (file)
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -64,5 +64,5 @@ CONFIG_USB_ETHER_MCS7830=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y
 CONFIG_CONSOLE_SCROLL_LINES=10

diff --git a/configs/ideapad-yoga-11_defconfig b/configs/ideapad-yoga-11_defconfig
index bc7f615..b77110e 100644 (file)
--- a/configs/ideapad-yoga-11_defconfig
+++ b/configs/ideapad-yoga-11_defconfig
@@ -83,4 +83,4 @@ CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
 CONFIG_VIDEO_BRIDGE_PARADE_DP501=y
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 737a061..d99adda 100644 (file)
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -53,4 +53,4 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/mocha_defconfig b/configs/mocha_defconfig
index dfeb16a..66cf81d 100644 (file)
--- a/configs/mocha_defconfig
+++ b/configs/mocha_defconfig
@@ -89,4 +89,4 @@ CONFIG_VIDEO_FONT_16X32=y
 # CONFIG_VIDEO_LOGO is not set
 CONFIG_VIDEO_LCD_SHARP_LQ079L1SX01=y
 CONFIG_BACKLIGHT_LP855x=y
-CONFIG_VIDEO_DSI_TEGRA30=y
+CONFIG_VIDEO_DSI_TEGRA=y

diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index b8645d6..af2cb71 100644 (file)
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -53,5 +53,5 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 CONFIG_I2C_EDID=y
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y
 CONFIG_CONSOLE_SCROLL_LINES=10

diff --git a/configs/picasso_defconfig b/configs/picasso_defconfig
index fe1eeb6..6a83df9 100644 (file)
--- a/configs/picasso_defconfig
+++ b/configs/picasso_defconfig
@@ -81,4 +81,4 @@ CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/qc750_defconfig b/configs/qc750_defconfig
index a42860d..9104cc0 100644 (file)
--- a/configs/qc750_defconfig
+++ b/configs/qc750_defconfig
@@ -80,4 +80,4 @@ CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index eeb911a..21375f2 100644 (file)
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -60,5 +60,5 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y
 CONFIG_CONSOLE_SCROLL_LINES=10

diff --git a/configs/surface-rt_defconfig b/configs/surface-rt_defconfig
index 24fca75..da19b34 100644 (file)
--- a/configs/surface-rt_defconfig
+++ b/configs/surface-rt_defconfig
@@ -79,4 +79,4 @@ CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 2f68610..7cb13f9 100644 (file)
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -53,4 +53,4 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/transformer_t20_defconfig b/configs/transformer_t20_defconfig
index 50b5885..c934e1a 100644 (file)
--- a/configs/transformer_t20_defconfig
+++ b/configs/transformer_t20_defconfig
@@ -81,4 +81,4 @@ CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/configs/transformer_t30_defconfig b/configs/transformer_t30_defconfig
index 3e2db0c..828634d 100644 (file)
--- a/configs/transformer_t30_defconfig
+++ b/configs/transformer_t30_defconfig
@@ -93,5 +93,5 @@ CONFIG_VIDEO=y
 CONFIG_VIDEO_BRIDGE=y
 # CONFIG_VIDEO_LOGO is not set
 CONFIG_VIDEO_BRIDGE_TOSHIBA_TC358768=y
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y
 CONFIG_VIDEO_HDMI_TEGRA=y

diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index c24fdca..3afa04d 100644 (file)
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -53,5 +53,5 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y
 CONFIG_CONSOLE_SCROLL_LINES=10

diff --git a/configs/x3_t30_defconfig b/configs/x3_t30_defconfig
index e738bd2..4252526 100644 (file)
--- a/configs/x3_t30_defconfig
+++ b/configs/x3_t30_defconfig
@@ -87,4 +87,4 @@ CONFIG_VIDEO_BRIDGE=y
 # CONFIG_VIDEO_LOGO is not set
 CONFIG_BACKLIGHT_LM3533=y
 CONFIG_VIDEO_BRIDGE_SOLOMON_SSD2825=y
-CONFIG_VIDEO_TEGRA20=y
+CONFIG_VIDEO_TEGRA=y

diff --git a/drivers/video/tegra/Kconfig b/drivers/video/tegra/Kconfig
index 3d61003..d3b8dbb 100644 (file)
--- a/drivers/video/tegra/Kconfig
+++ b/drivers/video/tegra/Kconfig
@@ -2,40 +2,45 @@ config HOST1X_TEGRA
        bool "NVIDIA Tegra host1x BUS support"
        depends on SIMPLE_BUS
 
-config VIDEO_TEGRA20
-       bool "Enable Display Controller support on Tegra20 and Tegra 30"
+config VIDEO_TEGRA
+       bool "Enable Display Controller support on Tegra devices"
        depends on OF_CONTROL
        select HOST1X_TEGRA
        help
-          T20/T30 support video output to an attached LCD panel as well as
-          other options such as HDMI. Only the LCD is supported in U-Boot.
-          This option enables this support which can be used on devices which
-          have an LCD display connected.
+          Enable support for Display Controller found in Tegra SoC. The
+          Display Controller Complex integrates two independent display
+          controllers. Each display controller is capable of interfacing
+          to an external display device, which can be a parallel interface
+          or SPI LCD, DVI, an HDMI HDTV, RGB monitor or a MIPI DSI LCD.
+          Direct interface is supported directly to most LCD displays with
+          TFT or TFT-like interface.
 
-config VIDEO_DSI_TEGRA30
-       bool "Enable Tegra 30 DSI support"
+config VIDEO_DSI_TEGRA
+       bool "Enable DSI controller support on Tegra devices"
        depends on VIDEO_BRIDGE && PANEL && DM_GPIO
-       select VIDEO_TEGRA20
+       select VIDEO_TEGRA
        select VIDEO_MIPI_DSI
        help
-          T30 has native support for DSI panels. This option enables support
-          for such panels which can be used on endeavoru and tf600t.
+          Enable support for the Display Serial Interface (DSI) found in
+          Tegra SoC. It is a MIPI standard serial bitstream, intended to
+          provide a low pin count interface to a display panel.
 
 config VIDEO_HDMI_TEGRA
-       bool "Enable Tegra HDMI support"
+       bool "Enable HDMI support on Tegra devices"
        depends on VIDEO_BRIDGE && DM_I2C
        select I2C_EDID
-       select VIDEO_TEGRA20
+       select VIDEO_TEGRA
        help
-          Tegra has native support for HDMI. This option enables support
-          for such connection and can be used for any supported device.
+          Enable support for the High-Definition Multimedia Interface (HDMI)
+          found in Tegra SoC.
 
 config TEGRA_BACKLIGHT_PWM
        bool "Enable Tegra DC PWM backlight support"
        depends on BACKLIGHT
-       select VIDEO_TEGRA20
+       select VIDEO_TEGRA
        help
-          Tegra DC dependent backlight.
+          Enable support for the Display Controller dependent PWM backlight
+          found in the Tegra SoC and usually used with DSI panels.
 
 config VIDEO_TEGRA124
        bool "Enable video support on Tegra124"

diff --git a/drivers/video/tegra/Makefile b/drivers/video/tegra/Makefile
index 4602b49..3c50a0b 100644 (file)
--- a/drivers/video/tegra/Makefile
+++ b/drivers/video/tegra/Makefile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 obj-$(CONFIG_HOST1X_TEGRA) += host1x.o
-obj-$(CONFIG_VIDEO_TEGRA20) += dc.o
-obj-$(CONFIG_VIDEO_DSI_TEGRA30) += dsi.o mipi.o mipi-phy.o
+obj-$(CONFIG_VIDEO_TEGRA) += dc.o
+obj-$(CONFIG_VIDEO_DSI_TEGRA) += dsi.o mipi.o mipi-phy.o
 obj-$(CONFIG_VIDEO_HDMI_TEGRA) += hdmi.o
 obj-$(CONFIG_TEGRA_BACKLIGHT_PWM) += dc-pwm-backlight.o