| Message ID | 76c0f364de11dc6a9a27f2d294145f261b7d0e61.1647274406.git.mchehab@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: Kconfig/Makefile reorg | expand |
Dne ponedeljek, 14. marec 2022 ob 17:34:32 CET je Mauro Carvalho Chehab napisal(a): > Now that each non-generic driver has their own directory, > sort the entries. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> > --- For sunxi: Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > > To avoid mailbombing on a large number of people, only mailing lists were C/ C on the cover. > See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover. 1647274406.git.mchehab@kernel.org/ > > drivers/media/platform/Kconfig | 98 +++++++++++++++------------------- > 1 file changed, 43 insertions(+), 55 deletions(-) > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index d5aedc6b5ca3..b7c60969c974 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -29,84 +29,72 @@ config V4L_MEM2MEM_DRIVERS > to capture and output drivers, which use memory buffers for just > one of those. > > +# Ancillary drivers > + > +config VIDEO_MEM2MEM_DEINTERLACE > + tristate "Deinterlace support" > + depends on V4L_MEM2MEM_DRIVERS > + depends on VIDEO_DEV && VIDEO_V4L2 > + depends on HAS_DMA > + select VIDEOBUF2_DMA_CONTIG > + select V4L2_MEM2MEM_DEV > + help > + Generic deinterlacing V4L2 driver. > + > +config VIDEO_MUX > + tristate "Video Multiplexer" > + depends on V4L_PLATFORM_DRIVERS > + select MULTIPLEXER > + depends on VIDEO_V4L2 && OF > + select MEDIA_CONTROLLER > + select VIDEO_V4L2_SUBDEV_API > + select REGMAP > + select V4L2_FWNODE > + help > + This driver provides support for N:1 video bus multiplexers. > + > +# Platform drivers - Please keep it alphabetically sorted > + > +# TODO: create per-manufacturer directories > + > source "drivers/media/platform/allegro-dvt/Kconfig" > -source "drivers/media/platform/nxp/Kconfig" > - > -source "drivers/media/platform/renesas/Kconfig" > - > -# V4L platform drivers > - > -source "drivers/media/platform/marvell-ccic/Kconfig" > - > -source "drivers/media/platform/via/Kconfig" > - > +source "drivers/media/platform/am437x/Kconfig" > source "drivers/media/platform/amphion/Kconfig" > +source "drivers/media/platform/aspeed/Kconfig" > +source "drivers/media/platform/atmel/Kconfig" > source "drivers/media/platform/cadence/Kconfig" > - > source "drivers/media/platform/coda/Kconfig" > source "drivers/media/platform/davinci/Kconfig" > - > source "drivers/media/platform/exynos-gsc/Kconfig" > +source "drivers/media/platform/exynos4-is/Kconfig" > +source "drivers/media/platform/intel/Kconfig" > +source "drivers/media/platform/marvell-ccic/Kconfig" > source "drivers/media/platform/meson/ge2d/Kconfig" > source "drivers/media/platform/mtk-jpeg/Kconfig" > source "drivers/media/platform/mtk-mdp/Kconfig" > source "drivers/media/platform/mtk-vcodec/Kconfig" > source "drivers/media/platform/mtk-vpu/Kconfig" > -source "drivers/media/platform/omap3isp/Kconfig" > +source "drivers/media/platform/nxp/Kconfig" > source "drivers/media/platform/omap/Kconfig" > +source "drivers/media/platform/omap3isp/Kconfig" > source "drivers/media/platform/qcom/camss/Kconfig" > source "drivers/media/platform/qcom/venus/Kconfig" > - > -source "drivers/media/platform/aspeed/Kconfig" > +source "drivers/media/platform/renesas/Kconfig" > source "drivers/media/platform/rockchip/rga/Kconfig" > source "drivers/media/platform/rockchip/rkisp1/Kconfig" > source "drivers/media/platform/s3c-camif/Kconfig" > source "drivers/media/platform/s5p-g2d/Kconfig" > source "drivers/media/platform/s5p-jpeg/Kconfig" > +source "drivers/media/platform/s5p-mfc/Kconfig" > +source "drivers/media/platform/sti/bdisp/Kconfig" > +source "drivers/media/platform/sti/c8sectpfe/Kconfig" > +source "drivers/media/platform/sti/delta/Kconfig" > source "drivers/media/platform/sti/hva/Kconfig" > source "drivers/media/platform/stm32/Kconfig" > +source "drivers/media/platform/sunxi/Kconfig" > source "drivers/media/platform/sunxi/sun8i-di/Kconfig" > source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" > source "drivers/media/platform/tegra/vde/Kconfig" > source "drivers/media/platform/ti-vpe/Kconfig" > - > -config VIDEO_MUX > - tristate "Video Multiplexer" > - depends on V4L_PLATFORM_DRIVERS > - select MULTIPLEXER > - depends on VIDEO_V4L2 && OF > - select MEDIA_CONTROLLER > - select VIDEO_V4L2_SUBDEV_API > - select REGMAP > - select V4L2_FWNODE > - help > - This driver provides support for N:1 video bus multiplexers. > - > -source "drivers/media/platform/intel/Kconfig" > - > -source "drivers/media/platform/exynos4-is/Kconfig" > -source "drivers/media/platform/am437x/Kconfig" > +source "drivers/media/platform/via/Kconfig" > source "drivers/media/platform/xilinx/Kconfig" > -source "drivers/media/platform/atmel/Kconfig" > -source "drivers/media/platform/sunxi/Kconfig" > - > -# Mem2mem drivers > - > -config VIDEO_MEM2MEM_DEINTERLACE > - tristate "Deinterlace support" > - depends on V4L_MEM2MEM_DRIVERS > - depends on VIDEO_DEV && VIDEO_V4L2 > - depends on HAS_DMA > - select VIDEOBUF2_DMA_CONTIG > - select V4L2_MEM2MEM_DEV > - help > - Generic deinterlacing V4L2 driver. > - > -source "drivers/media/platform/s5p-mfc/Kconfig" > - > -source "drivers/media/platform/sti/bdisp/Kconfig" > - > -source "drivers/media/platform/sti/delta/Kconfig" > - > -# DVB platform drivers > -source "drivers/media/platform/sti/c8sectpfe/Kconfig" > -- > 2.35.1 > >
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d5aedc6b5ca3..b7c60969c974 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -29,84 +29,72 @@ config V4L_MEM2MEM_DRIVERS to capture and output drivers, which use memory buffers for just one of those. +# Ancillary drivers + +config VIDEO_MEM2MEM_DEINTERLACE + tristate "Deinterlace support" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on HAS_DMA + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Generic deinterlacing V4L2 driver. + +config VIDEO_MUX + tristate "Video Multiplexer" + depends on V4L_PLATFORM_DRIVERS + select MULTIPLEXER + depends on VIDEO_V4L2 && OF + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select REGMAP + select V4L2_FWNODE + help + This driver provides support for N:1 video bus multiplexers. + +# Platform drivers - Please keep it alphabetically sorted + +# TODO: create per-manufacturer directories + source "drivers/media/platform/allegro-dvt/Kconfig" -source "drivers/media/platform/nxp/Kconfig" - -source "drivers/media/platform/renesas/Kconfig" - -# V4L platform drivers - -source "drivers/media/platform/marvell-ccic/Kconfig" - -source "drivers/media/platform/via/Kconfig" - +source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amphion/Kconfig" +source "drivers/media/platform/aspeed/Kconfig" +source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" - source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" - source "drivers/media/platform/exynos-gsc/Kconfig" +source "drivers/media/platform/exynos4-is/Kconfig" +source "drivers/media/platform/intel/Kconfig" +source "drivers/media/platform/marvell-ccic/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" -source "drivers/media/platform/omap3isp/Kconfig" +source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" +source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" - -source "drivers/media/platform/aspeed/Kconfig" +source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" +source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/sti/bdisp/Kconfig" +source "drivers/media/platform/sti/c8sectpfe/Kconfig" +source "drivers/media/platform/sti/delta/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" +source "drivers/media/platform/sunxi/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" - -config VIDEO_MUX - tristate "Video Multiplexer" - depends on V4L_PLATFORM_DRIVERS - select MULTIPLEXER - depends on VIDEO_V4L2 && OF - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select REGMAP - select V4L2_FWNODE - help - This driver provides support for N:1 video bus multiplexers. - -source "drivers/media/platform/intel/Kconfig" - -source "drivers/media/platform/exynos4-is/Kconfig" -source "drivers/media/platform/am437x/Kconfig" +source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" -source "drivers/media/platform/atmel/Kconfig" -source "drivers/media/platform/sunxi/Kconfig" - -# Mem2mem drivers - -config VIDEO_MEM2MEM_DEINTERLACE - tristate "Deinterlace support" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on HAS_DMA - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Generic deinterlacing V4L2 driver. - -source "drivers/media/platform/s5p-mfc/Kconfig" - -source "drivers/media/platform/sti/bdisp/Kconfig" - -source "drivers/media/platform/sti/delta/Kconfig" - -# DVB platform drivers -source "drivers/media/platform/sti/c8sectpfe/Kconfig"