drivers: video: move all sensors to a dedicated directory

This is meant to clearly identify all sensors and facilitate grouped maintenace of all sensors. This also updates the layout of the Kconfig and CMakeLists.txt to how it is done to the root level Kconfig/CMakeLists.txt. Signed-off-by: Josuah Demangeon <[email protected]>
zephyrproject-rtos · May 21, 2024 · ce289c7 · ce289c7
1 parent 34c84ec
commit ce289c7
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 14 deletions.
diff --git a/drivers/video/CMakeLists.txt b/drivers/video/CMakeLists.txt
@@ -4,10 +4,10 @@ zephyr_library()
 
 zephyr_library_sources(video_common.c)
 
+add_subdirectory(sensor)
+
+# zephyr-keep-sorted-start
 zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI	video_mcux_csi.c)
 zephyr_library_sources_ifdef(CONFIG_VIDEO_SW_GENERATOR	video_sw_generator.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114	mt9m114.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725	ov7725.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640	ov2640.c)
 zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMI	video_stm32_dcmi.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640	ov5640.c)
+# zephyr-keep-sorted-stop
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
@@ -31,18 +31,12 @@ config VIDEO_BUFFER_POOL_ALIGN
 	int "Alignment of the video pool’s buffer"
 	default 64
 
-source "drivers/video/Kconfig.mcux_csi"
+source "drivers/video/sensor/Kconfig"
 
+# zephyr-keep-sorted-start
+source "drivers/video/Kconfig.mcux_csi"
 source "drivers/video/Kconfig.sw_generator"
-
-source "drivers/video/Kconfig.mt9m114"
-
-source "drivers/video/Kconfig.ov7725"
-
-source "drivers/video/Kconfig.ov2640"
-
 source "drivers/video/Kconfig.stm32_dcmi"
-
-source "drivers/video/Kconfig.ov5640"
+# zephyr-keep-sorted-stop
 
 endif # VIDEO
diff --git a/drivers/video/sensor/CMakeLists.txt b/drivers/video/sensor/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+# zephyr-keep-sorted-start
+zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114       mt9m114.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640        ov2640.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640        ov5640.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725        ov7725.c)
+# zephyr-keep-sorted-stop
diff --git a/drivers/video/sensor/Kconfig b/drivers/video/sensor/Kconfig
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+source "drivers/video/sensor/Kconfig.mt9m114"
+source "drivers/video/sensor/Kconfig.ov2640"
+source "drivers/video/sensor/Kconfig.ov5640"
+source "drivers/video/sensor/Kconfig.ov7725"
+# zephyr-keep-sorted-stop
diff --git a/drivers/video/Kconfig.mt9m114 → drivers/video/sensor/Kconfig.mt9m114 b/drivers/video/Kconfig.mt9m114 → drivers/video/sensor/Kconfig.mt9m114
diff --git a/drivers/video/Kconfig.ov2640 → drivers/video/sensor/Kconfig.ov2640 b/drivers/video/Kconfig.ov2640 → drivers/video/sensor/Kconfig.ov2640
diff --git a/drivers/video/Kconfig.ov5640 → drivers/video/sensor/Kconfig.ov5640 b/drivers/video/Kconfig.ov5640 → drivers/video/sensor/Kconfig.ov5640
diff --git a/drivers/video/Kconfig.ov7725 → drivers/video/sensor/Kconfig.ov7725 b/drivers/video/Kconfig.ov7725 → drivers/video/sensor/Kconfig.ov7725
diff --git a/drivers/video/mt9m114.c → drivers/video/sensor/mt9m114.c b/drivers/video/mt9m114.c → drivers/video/sensor/mt9m114.c
diff --git a/drivers/video/ov2640.c → drivers/video/sensor/ov2640.c b/drivers/video/ov2640.c → drivers/video/sensor/ov2640.c
diff --git a/drivers/video/ov5640.c → drivers/video/sensor/ov5640.c b/drivers/video/ov5640.c → drivers/video/sensor/ov5640.c
diff --git a/drivers/video/ov7725.c → drivers/video/sensor/ov7725.c b/drivers/video/ov7725.c → drivers/video/sensor/ov7725.c