diff --git a/drivers/video/tegra/Makefile b/drivers/video/tegra/Makefile
index cd4cf72..4602b49 100644
--- a/drivers/video/tegra/Makefile
+++ b/drivers/video/tegra/Makefile
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0+
 
-obj-$(CONFIG_HOST1X_TEGRA) += tegra-host1x.o
-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_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_HDMI_TEGRA) += hdmi.o
+obj-$(CONFIG_TEGRA_BACKLIGHT_PWM) += dc-pwm-backlight.o
 
 obj-${CONFIG_VIDEO_TEGRA124} += tegra124/
diff --git a/drivers/video/tegra/tegra-pwm-backlight.c b/drivers/video/tegra/dc-pwm-backlight.c
similarity index 99%
rename from drivers/video/tegra/tegra-pwm-backlight.c
rename to drivers/video/tegra/dc-pwm-backlight.c
index 998f0df..eff10b5 100644
--- a/drivers/video/tegra/tegra-pwm-backlight.c
+++ b/drivers/video/tegra/dc-pwm-backlight.c
@@ -15,7 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 
-#include "tegra-dc.h"
+#include "dc.h"
 
 #define TEGRA_PWM_BL_MIN_BRIGHTNESS	0x10
 #define TEGRA_PWM_BL_MAX_BRIGHTNESS	0xFF
diff --git a/drivers/video/tegra/tegra-dc.c b/drivers/video/tegra/dc.c
similarity index 99%
rename from drivers/video/tegra/tegra-dc.c
rename to drivers/video/tegra/dc.c
index 1f43153..f0e3d2c 100644
--- a/drivers/video/tegra/tegra-dc.c
+++ b/drivers/video/tegra/dc.c
@@ -19,7 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/powergate.h>
 
-#include "tegra-dc.h"
+#include "dc.h"
 
 /* Holder of Tegra per-SOC DC differences */
 struct tegra_dc_soc_info {
diff --git a/drivers/video/tegra/tegra-dc.h b/drivers/video/tegra/dc.h
similarity index 100%
rename from drivers/video/tegra/tegra-dc.h
rename to drivers/video/tegra/dc.h
diff --git a/drivers/video/tegra/tegra-dsi.c b/drivers/video/tegra/dsi.c
similarity index 99%
rename from drivers/video/tegra/tegra-dsi.c
rename to drivers/video/tegra/dsi.c
index a96fba0..bc30886 100644
--- a/drivers/video/tegra/tegra-dsi.c
+++ b/drivers/video/tegra/dsi.c
@@ -24,8 +24,8 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
 
-#include "tegra-dc.h"
-#include "tegra-dsi.h"
+#include "dc.h"
+#include "dsi.h"
 #include "mipi-phy.h"
 
 /* List of supported DSI bridges */
diff --git a/drivers/video/tegra/tegra-dsi.h b/drivers/video/tegra/dsi.h
similarity index 100%
rename from drivers/video/tegra/tegra-dsi.h
rename to drivers/video/tegra/dsi.h
diff --git a/drivers/video/tegra/tegra-hdmi.c b/drivers/video/tegra/hdmi.c
similarity index 99%
rename from drivers/video/tegra/tegra-hdmi.c
rename to drivers/video/tegra/hdmi.c
index bda6991..bfb48b2 100644
--- a/drivers/video/tegra/tegra-hdmi.c
+++ b/drivers/video/tegra/hdmi.c
@@ -22,8 +22,8 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 
-#include "tegra-dc.h"
-#include "tegra-hdmi.h"
+#include "dc.h"
+#include "hdmi.h"
 
 #define DDCCI_ENTRY_ADDR	0x37
 #define DDCCI_SOURSE_ADDR	0x51
diff --git a/drivers/video/tegra/tegra-hdmi.h b/drivers/video/tegra/hdmi.h
similarity index 100%
rename from drivers/video/tegra/tegra-hdmi.h
rename to drivers/video/tegra/hdmi.h
diff --git a/drivers/video/tegra/tegra-host1x.c b/drivers/video/tegra/host1x.c
similarity index 100%
rename from drivers/video/tegra/tegra-host1x.c
rename to drivers/video/tegra/host1x.c
diff --git a/drivers/video/tegra/tegra-mipi.c b/drivers/video/tegra/mipi.c
similarity index 100%
rename from drivers/video/tegra/tegra-mipi.c
rename to drivers/video/tegra/mipi.c