diff --git a/MAINTAINERS b/MAINTAINERS
index fd97d0e4eb8632dec15e473ba84a11402a448ae3..e56c61afe18b4bd4ac54769b0b40169eba363403 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19262,7 +19262,7 @@ S:	Maintained
 W:	https://linuxtv.org
 Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 T:	git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
-F:	drivers/media/platform/am437x/
+F:	drivers/media/platform/ti/am437x/
 
 TI BANDGAP AND THERMAL DRIVER
 M:	Eduardo Valentin <edubezval@gmail.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f14996793c1ffaf3b3600776db2121f5cddec761..f1a1a08a205b71884bef0b7e50f1a9371727de9e 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -97,6 +97,7 @@ source "drivers/media/platform/sunxi/Kconfig"
 source "drivers/media/platform/st/sti/Kconfig"
 source "drivers/media/platform/st/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
+source "drivers/media/platform/ti/am437x/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
 
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 8b90e2344168585a683f089d688542920948ff23..2a23f30f63778938371f250f8fb5478882dbdadf 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -42,6 +42,7 @@ obj-y += st/sti/delta/
 obj-y += st/sti/hva/
 obj-y += st/stm32/
 obj-y += ti-vpe/
+obj-y += ti/am437x/
 obj-y += via/
 obj-y += xilinx/
 
diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/ti/am437x/Kconfig
similarity index 100%
rename from drivers/media/platform/am437x/Kconfig
rename to drivers/media/platform/ti/am437x/Kconfig
diff --git a/drivers/media/platform/am437x/Makefile b/drivers/media/platform/ti/am437x/Makefile
similarity index 100%
rename from drivers/media/platform/am437x/Makefile
rename to drivers/media/platform/ti/am437x/Makefile
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c
similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe.c
rename to drivers/media/platform/ti/am437x/am437x-vpfe.c
diff --git a/drivers/media/platform/am437x/am437x-vpfe.h b/drivers/media/platform/ti/am437x/am437x-vpfe.h
similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe.h
rename to drivers/media/platform/ti/am437x/am437x-vpfe.h
diff --git a/drivers/media/platform/am437x/am437x-vpfe_regs.h b/drivers/media/platform/ti/am437x/am437x-vpfe_regs.h
similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe_regs.h
rename to drivers/media/platform/ti/am437x/am437x-vpfe_regs.h