media: platform: ti/Kconfig: move VPE/CAL entries to it

In order to follow the changes made by the previous patch,
which moved platform/ti-vpe to platform/ti, move the Kconfig
entries to the same place.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/Kconfig b/drivers/media/platform/ti-vpe/Kconfig
deleted file mode 100644 (file)
index a9ee018..0000000
--- a/drivers/media/platform/ti-vpe/Kconfig
+++ /dev/null
@@ -1,62 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-# TI VIDEO PORT Helper Modules
-# These will be selected by VPE and VIP
-config VIDEO_TI_VPDMA
-       tristate
-
-config VIDEO_TI_SC
-       tristate
-
-config VIDEO_TI_CSC
-       tristate
-
-# V4L drivers
-
-config VIDEO_TI_CAL
-       tristate "TI CAL (Camera Adaptation Layer) driver"
-       depends on VIDEO_DEV && VIDEO_V4L2
-       depends on V4L_PLATFORM_DRIVERS
-       select MEDIA_CONTROLLER
-       select VIDEO_V4L2_SUBDEV_API
-       depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST
-       select VIDEOBUF2_DMA_CONTIG
-       select V4L2_FWNODE
-       help
-         Support for the TI CAL (Camera Adaptation Layer) block
-         found on DRA72X SoC.
-         In TI Technical Reference Manual this module is referred as
-         Camera Interface Subsystem (CAMSS).
-
-config VIDEO_TI_CAL_MC
-       bool "Media Controller centric mode by default"
-       depends on VIDEO_TI_CAL
-       default n
-       help
-         Enables Media Controller centric mode by default.
-
-         If set, CAL driver will start in Media Controller mode by
-         default. Note that this behavior can be overridden via
-         module parameter 'mc_api'.
-
-# Mem2mem drivers
-
-config VIDEO_TI_VPE
-       tristate "TI VPE (Video Processing Engine) driver"
-       depends on V4L_MEM2MEM_DRIVERS
-       depends on VIDEO_DEV && VIDEO_V4L2
-       depends on SOC_DRA7XX || COMPILE_TEST
-       select VIDEOBUF2_DMA_CONTIG
-       select V4L2_MEM2MEM_DEV
-       select VIDEO_TI_VPDMA
-       select VIDEO_TI_SC
-       select VIDEO_TI_CSC
-       help
-         Support for the TI VPE(Video Processing Engine) block
-         found on DRA7XX SoC.
-
-config VIDEO_TI_VPE_DEBUG
-       bool "VPE debug messages"
-       depends on VIDEO_TI_VPE
-       help
-         Enable debug messages on VPE driver.

diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig
new file mode 100644 (file)
index 0000000..82e285c
--- /dev/null
+++ b/drivers/media/platform/ti/Kconfig
@@ -0,0 +1,64 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Texas Instruments drivers"
+
+# TI VIDEO PORT Helper Modules
+# These will be selected by VPE and VIP
+config VIDEO_TI_VPDMA
+       tristate
+
+config VIDEO_TI_SC
+       tristate
+
+config VIDEO_TI_CSC
+       tristate
+
+# V4L drivers
+
+config VIDEO_TI_CAL
+       tristate "TI CAL (Camera Adaptation Layer) driver"
+       depends on VIDEO_DEV
+       depends on V4L_PLATFORM_DRIVERS
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
+       depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_FWNODE
+       help
+         Support for the TI CAL (Camera Adaptation Layer) block
+         found on DRA72X SoC.
+         In TI Technical Reference Manual this module is referred as
+         Camera Interface Subsystem (CAMSS).
+
+config VIDEO_TI_CAL_MC
+       bool "Media Controller centric mode by default"
+       depends on VIDEO_TI_CAL
+       default n
+       help
+         Enables Media Controller centric mode by default.
+
+         If set, CAL driver will start in Media Controller mode by
+         default. Note that this behavior can be overridden via
+         module parameter 'mc_api'.
+
+# Mem2mem drivers
+
+config VIDEO_TI_VPE
+       tristate "TI VPE (Video Processing Engine) driver"
+       depends on V4L_MEM2MEM_DRIVERS
+       depends on VIDEO_DEV
+       depends on SOC_DRA7XX || COMPILE_TEST
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       select VIDEO_TI_VPDMA
+       select VIDEO_TI_SC
+       select VIDEO_TI_CSC
+       help
+         Support for the TI VPE(Video Processing Engine) block
+         found on DRA7XX SoC.
+
+config VIDEO_TI_VPE_DEBUG
+       bool "VPE debug messages"
+       depends on VIDEO_TI_VPE
+       help
+         Enable debug messages on VPE driver.