Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / media / Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 81b3ba8..6995940 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -13,6 +13,19 @@ if MEDIA_SUPPORT
 
 comment "Multimedia core support"
 
+#
+# Media controller
+#
+
+config MEDIA_CONTROLLER
+       bool "Media Controller API (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       ---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.
+
 #
 # V4L core and enabled API's
 #
@@ -40,6 +53,15 @@ config VIDEO_V4L2_COMMON
        depends on (I2C || I2C=n) && VIDEO_DEV
        default (I2C || I2C=n) && VIDEO_DEV
 
+config VIDEO_V4L2_SUBDEV_API
+       bool "V4L2 sub-device userspace API (EXPERIMENTAL)"
+       depends on VIDEO_DEV && MEDIA_CONTROLLER && EXPERIMENTAL
+       ---help---
+         Enables the V4L2 sub-device pad-level userspace API used to configure
+         video format, size and frame rate between hardware blocks.
+
+         This API is mostly used by camera interfaces in embedded platforms.
+
 #
 # DVB Core
 #