[media] s5p-fimc: Add runtime PM support in the mem-to-mem driver

[deliverable/linux.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 509a5da8e814adb164ca73d0b99b15472692e4b1..14326d7da559149fd006e622efe4c23718d578dc 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -848,6 +848,12 @@ config SOC_CAMERA_OV2640
        help
          This is a ov2640 camera driver
 
+config SOC_CAMERA_OV5642
+       tristate "ov5642 camera support"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a V4L2 camera driver for the OmniVision OV5642 sensor
+
 config SOC_CAMERA_OV6650
        tristate "ov6650 sensor support"
        depends on SOC_CAMERA && I2C
@@ -944,7 +950,7 @@ config VIDEO_MX2
 
 config  VIDEO_SAMSUNG_S5P_FIMC
        tristate "Samsung S5P and EXYNOS4 camera host interface driver"
-       depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
+       depends on VIDEO_V4L2 && PLAT_S5P && PM_RUNTIME
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        ---help---
@@ -971,6 +977,8 @@ config VIDEO_S5P_MIPI_CSIS
          To compile this driver as a module, choose M here: the
          module will be called s5p-csis.
 
+source "drivers/media/video/s5p-tv/Kconfig"
+
 #
 # USB Multimedia device configuration
 #