media: ipu-bridge: fix ipu6 Kconfig dependencies

Commit 4670c8c3fb04 ("media: ipu-bridge: Fix Kconfig dependencies") changed
how IPU_BRIDGE dependencies are handled for all drivers, but the IPU6
variant was added the old way, which causes build time warnings when I2C is
turned off:

WARNING: unmet direct dependencies detected for IPU_BRIDGE
  Depends on [n]: MEDIA_SUPPORT [=m] && PCI [=y] && MEDIA_PCI_SUPPORT [=y] && (ACPI [=y] || COMPILE_TEST [=y]) && I2C [=n]
  Selected by [m]:
  - VIDEO_INTEL_IPU6 [=m] && MEDIA_SUPPORT [=m] && PCI [=y] && MEDIA_PCI_SUPPORT [=y] && (ACPI [=y] || COMPILE_TEST [=y]) && VIDEO_DEV [=m] && X86 [=y] && X86_64 [=y] && HAS_DMA [=y]

To make it consistent with the other IPU drivers as well as avoid this
warning, change the 'select' into 'depends on'.

Fixes: c70281cc83d6 ("media: intel/ipu6: add Kconfig and Makefile")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[Sakari Ailus: Alternatively depend on !IPU_BRIDGE.]
Cc: stable@vger.kernel.org # for v6.10
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/intel/ipu6/Kconfig b/drivers/media/pci/intel/ipu6/Kconfig
index 154343080c82a64106f0fca20cdf54cb9c2a21f4..b7ab24b898363836813a6154d0841eb76c1bed1d 100644 (file)
--- a/drivers/media/pci/intel/ipu6/Kconfig
+++ b/drivers/media/pci/intel/ipu6/Kconfig
@@ -3,13 +3,13 @@ config VIDEO_INTEL_IPU6
        depends on ACPI || COMPILE_TEST
        depends on VIDEO_DEV
        depends on X86 && X86_64 && HAS_DMA
+       depends on IPU_BRIDGE || !IPU_BRIDGE
        select DMA_OPS
        select IOMMU_IOVA
        select VIDEO_V4L2_SUBDEV_API
        select MEDIA_CONTROLLER
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE
-       select IPU_BRIDGE
        help
          This is the 6th Gen Intel Image Processing Unit, found in Intel SoCs
          and used for capturing images and video from camera sensors.