In order to cleanup the main platform media directory, move Intel driver to its own directory. Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/38] at: https://lore.kernel.org/all/cover.1647006877.git.mchehab@xxxxxxxxxx/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/Makefile | 2 +- drivers/media/platform/intel/Kconfig | 11 +++++++++++ drivers/media/platform/intel/Makefile | 1 + drivers/media/platform/{ => intel}/pxa_camera.c | 0 5 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/intel/Kconfig create mode 100644 drivers/media/platform/intel/Makefile rename drivers/media/platform/{ => intel}/pxa_camera.c (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f5ef28d3e53c..efdb5fe592c6 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -104,16 +104,7 @@ config VIDEO_OMAP3_DEBUG help Enable debug messages on OMAP 3 camera controller driver. -config VIDEO_PXA27x - tristate "PXA27x Quick Capture Interface driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on PXA27x || COMPILE_TEST - select VIDEOBUF2_DMA_SG - select SG_SPLIT - select V4L2_FWNODE - help - This is a v4l2 driver for the PXA27x Quick Capture Interface +source "drivers/media/platform/intel/Kconfig" config VIDEO_QCOM_CAMSS tristate "Qualcomm V4L2 Camera Subsystem driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index e9f982eb034b..c290835885de 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -16,6 +16,7 @@ obj-y += exynos4-is/ obj-y += exynos-gsc/ obj-y += imx/ obj-y += imx-jpeg/ +obj-y += intel/ obj-y += marvell-ccic/ obj-y += meson/ge2d/ obj-y += mtk-jpeg/ @@ -48,7 +49,6 @@ obj-y += xilinx/ # Please place here only ancillary drivers that aren't SoC-specific obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) += video-mux.o -obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o obj-$(CONFIG_VIDEO_RENESAS_CEU) += renesas-ceu.o diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig new file mode 100644 index 000000000000..aeda421f7248 --- /dev/null +++ b/drivers/media/platform/intel/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_PXA27x + tristate "PXA27x Quick Capture Interface driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on PXA27x || COMPILE_TEST + select VIDEOBUF2_DMA_SG + select SG_SPLIT + select V4L2_FWNODE + help + This is a v4l2 driver for the PXA27x Quick Capture Interface diff --git a/drivers/media/platform/intel/Makefile b/drivers/media/platform/intel/Makefile new file mode 100644 index 000000000000..10ea23fb2bcc --- /dev/null +++ b/drivers/media/platform/intel/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c similarity index 100% rename from drivers/media/platform/pxa_camera.c rename to drivers/media/platform/intel/pxa_camera.c -- 2.35.1