media: drivers: media: i2c: don't enable if CONFIG_DRM_I2C_ADV7511=n

CONFIG_DRM_I2C_ADV7511 and CONFIG_VIDEO_ADV7511 bind to the same
platform device, so whichever driver gets loaded first will be used on
the device. So they shouldn't be enabled at the same time.

Rework so that VIDEO_ADV7511 and VIDEO_COBALT depends on
DRM_I2C_ADV7511=n or COMPILE_TEST.

Suggested-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 95d42730745c7f3c84e967e60386c084e2563c4f..79ce9ec6fc1be1e612af10ec96cbbb166502033c 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -511,6 +511,7 @@ config VIDEO_ADV7393
 config VIDEO_ADV7511
        tristate "Analog Devices ADV7511 encoder"
        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
+       depends on DRM_I2C_ADV7511=n || COMPILE_TEST
        select HDMI
        help
          Support for the Analog Devices ADV7511 video encoder.

diff --git a/drivers/media/pci/cobalt/Kconfig b/drivers/media/pci/cobalt/Kconfig
index 6c6c60abe9b1193d9ca788dfaba5682a7cc5954d..e0e7df460a92bd5026defe1f7e91678aab3732b0 100644 (file)
--- a/drivers/media/pci/cobalt/Kconfig
+++ b/drivers/media/pci/cobalt/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_COBALT
        tristate "Cisco Cobalt support"
        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
        depends on PCI_MSI && MTD_COMPLEX_MAPPINGS
-       depends on GPIOLIB || COMPILE_TEST
+       depends on (GPIOLIB && DRM_I2C_ADV7511=n) || COMPILE_TEST
        depends on SND
        depends on MTD
        select I2C_ALGOBIT