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 6425fa881ea6a90ee035276bc5c6a809b9236483..d432fd2b843de55d295bdc9dba8b5b3f94e267bd 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 fb3d7fc62381a120ee3f73d12fbe6122de0f7ba2..c85994b44b83344d12ab926e3680ddbff3fbb9c9 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 b98f23a4baf69ef97c0a439c713eea257ed6b510..016fc60b41a0452c2ddf493586593f4593f3f6de 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 fa8fe24ca38919fab2e048f84d353824753806c6..9fa9c12918b940846f7a53de383073c328f82b4e 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 bc7f615cdf07d91f223f88ca08822fd8e2f6f041..b77110ed8407c405470ef1b80e114447ea17565e 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 737a0613ce11b00fc646d8701c5d0abee14c799a..d99addadf86c721cd0428dcd5fdeae336f212c10 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 dfeb16ac08eeceab0ba2093f425836a56fcd33a9..66cf81d3c7957264af13f24335fb87417be259e1 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 b8645d66619a2f0e72adf79e05b7337ee655c0db..af2cb712e06e41c37c5da8ecc064c3e48e9de942 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 fe1eeb6ed10eaa9d5373d368be9baa77b45d6800..6a83df919b536de18cd176f99715ed6873c6d4de 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 a42860dc9ba07034c0d47a80dbe50548c2bcda26..9104cc084be5cf14bf883bc9c3eda1a85241295c 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 eeb911a78058e6071dda285d111a16f675e25637..21375f233f072b585635d795fbc43ed1801c54f5 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 24fca755dc5ef42acb05615b266b7ccc6f10a0c9..da19b34e64aed0f5598290e8d5fb8b108a20f64d 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 2f686105700ed2d4e11a5a65c22f5e3fc0f4ad4c..7cb13f9f5af39263d36e3ad2b3505a3a98f4eb10 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 50b5885bb0947339653ad8098a5ea46c936adc08..c934e1a241064eb017627599886540c03ff653ea 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 3e2db0cb7d02ce88ec77a23c0c91369eea5a8c11..828634dc59010a0ef5d56853e8c63451bbd13a19 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 c24fdcad533d08bfb6284fb20e84c316f0cc4823..3afa04dd10a962acf16530a6fbfe7ef807670a77 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 e738bd232d061d6d0ced5e69a739fd379a1f97e8..4252526992d12a94a775db174ab48ee0fc16874a 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 3d610036a1fec5b5f0c443001c89b734ffcf6a2d..d3b8dbb2826d686c3f312f6a69d793548f53c061 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 4602b49ee733e84f19daf044d5069c3143189772..3c50a0ba3c3cf8ce19a896e9fafb1c465d1f08c2 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