media: move drivers/media/media-* to drivers/media/mc/mc-*
It is really weird that the media controller sources are all top-level in drivers/media. It is a bit of a left-over from long ago when most media sources were all at the top-level. At some point we reorganized the directory structure, but the media-*.c sources where never moved to their own directory. So create a new mc directory and move all sources there. Also rename the prefix from media- to mc-. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
03006bd088
commit
c612e54fca
|
@ -89,39 +89,7 @@ config MEDIA_CEC_SUPPORT
|
|||
|
||||
source "drivers/media/cec/Kconfig"
|
||||
|
||||
#
|
||||
# Media controller
|
||||
# Selectable only for webcam/grabbers, as other drivers don't use it
|
||||
#
|
||||
|
||||
config MEDIA_CONTROLLER
|
||||
bool "Media Controller API"
|
||||
depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
|
||||
help
|
||||
Enable the media controller API used to query media devices internal
|
||||
topology and configure it dynamically.
|
||||
|
||||
This API is mostly used by camera interfaces in embedded platforms.
|
||||
|
||||
config MEDIA_CONTROLLER_DVB
|
||||
bool "Enable Media controller for DVB (EXPERIMENTAL)"
|
||||
depends on MEDIA_CONTROLLER && DVB_CORE
|
||||
help
|
||||
Enable the media controller API support for DVB.
|
||||
|
||||
This is currently experimental.
|
||||
|
||||
config MEDIA_CONTROLLER_REQUEST_API
|
||||
bool "Enable Media controller Request API (EXPERIMENTAL)"
|
||||
depends on MEDIA_CONTROLLER && STAGING_MEDIA
|
||||
help
|
||||
DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING.
|
||||
|
||||
This option enables the Request API for the Media controller and V4L2
|
||||
interfaces. It is currently needed by a few stateless codec drivers.
|
||||
|
||||
There is currently no intention to provide API or ABI stability for
|
||||
this new API as of yet.
|
||||
source "drivers/media/mc/Kconfig"
|
||||
|
||||
#
|
||||
# Video4Linux support
|
||||
|
|
|
@ -3,15 +3,6 @@
|
|||
# Makefile for the kernel multimedia device drivers.
|
||||
#
|
||||
|
||||
media-objs := media-device.o media-devnode.o media-entity.o \
|
||||
media-request.o
|
||||
|
||||
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
|
||||
ifeq ($(CONFIG_USB),y)
|
||||
media-objs += media-dev-allocator.o
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# I2C drivers should come before other drivers, otherwise they'll fail
|
||||
# when compiled as builtin drivers
|
||||
|
@ -20,10 +11,10 @@ obj-y += i2c/ tuners/
|
|||
obj-$(CONFIG_DVB_CORE) += dvb-frontends/
|
||||
|
||||
#
|
||||
# Now, let's link-in the media core
|
||||
# Now, let's link-in the media controller core
|
||||
#
|
||||
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
|
||||
obj-$(CONFIG_MEDIA_SUPPORT) += media.o
|
||||
obj-$(CONFIG_MEDIA_SUPPORT) += mc/
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
|
||||
|
|
33
drivers/media/mc/Kconfig
Normal file
33
drivers/media/mc/Kconfig
Normal file
|
@ -0,0 +1,33 @@
|
|||
#
|
||||
# Media controller
|
||||
# Selectable only for webcam/grabbers, as other drivers don't use it
|
||||
#
|
||||
|
||||
config MEDIA_CONTROLLER
|
||||
bool "Media Controller API"
|
||||
depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
|
||||
help
|
||||
Enable the media controller API used to query media devices internal
|
||||
topology and configure it dynamically.
|
||||
|
||||
This API is mostly used by camera interfaces in embedded platforms.
|
||||
|
||||
config MEDIA_CONTROLLER_DVB
|
||||
bool "Enable Media controller for DVB (EXPERIMENTAL)"
|
||||
depends on MEDIA_CONTROLLER && DVB_CORE
|
||||
help
|
||||
Enable the media controller API support for DVB.
|
||||
|
||||
This is currently experimental.
|
||||
|
||||
config MEDIA_CONTROLLER_REQUEST_API
|
||||
bool "Enable Media controller Request API (EXPERIMENTAL)"
|
||||
depends on MEDIA_CONTROLLER && STAGING_MEDIA
|
||||
help
|
||||
DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING.
|
||||
|
||||
This option enables the Request API for the Media controller and V4L2
|
||||
interfaces. It is currently needed by a few stateless codec drivers.
|
||||
|
||||
There is currently no intention to provide API or ABI stability for
|
||||
this new API as of yet.
|
10
drivers/media/mc/Makefile
Normal file
10
drivers/media/mc/Makefile
Normal file
|
@ -0,0 +1,10 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
mc-objs := mc-device.o mc-devnode.o mc-entity.o \
|
||||
mc-request.o
|
||||
|
||||
ifeq ($(CONFIG_USB),y)
|
||||
mc-objs += mc-dev-allocator.o
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_MEDIA_SUPPORT) += mc.o
|
Loading…
Reference in a new issue