media: v4l: cadence: add VIDEO_V4L2 dependency
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 May 2018 22:07:10 +0000 (18:07 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 27 Jun 2018 13:51:49 +0000 (09:51 -0400)
The cadence media drivers can be built-in while the v4l2 core is a loadable
module. This is a mistake and leads to link errors:

drivers/media/v4l2-core/v4l2-fwnode.o: In function `v4l2_async_register_subdev_sensor_common':
v4l2-fwnode.c:(.text+0x12f0): undefined reference to `v4l2_async_subdev_notifier_register'
v4l2-fwnode.c:(.text+0x1304): undefined reference to `v4l2_async_register_subdev'
v4l2-fwnode.c:(.text+0x1318): undefined reference to `v4l2_async_notifier_unregister'
v4l2-fwnode.c:(.text+0x1338): undefined reference to `v4l2_async_notifier_cleanup'
cdns-csi2rx.c:(.text+0x9f8): undefined reference to `v4l2_subdev_init'
cdns-csi2rx.c:(.text+0xa78): undefined reference to `v4l2_async_register_subdev'
drivers/media/platform/cadence/cdns-csi2tx.o: In function `csi2tx_remove':
cdns-csi2tx.c:(.text+0x88): undefined reference to `v4l2_async_unregister_subdev'
drivers/media/platform/cadence/cdns-csi2tx.o: In function `csi2tx_probe':
cdns-csi2tx.c:(.text+0x884): undefined reference to `v4l2_subdev_init'
cdns-csi2tx.c:(.text+0xa9c): undefined reference to `v4l2_async_register_subdev'

An explicit Kconfig dependency on VIDEO_V4L2 avoids the problem.

Fixes: 1fc3b37f34f6 ("media: v4l: cadence: Add Cadence MIPI-CSI2 RX driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/cadence/Kconfig

index 3bf0f245438414bd98866f08a15a950eaff956d5..cf6124da3c54d96482d48ed445dd0d60d11fa8f7 100644 (file)
@@ -11,6 +11,7 @@ if VIDEO_CADENCE
 
 config VIDEO_CADENCE_CSI2RX
        tristate "Cadence MIPI-CSI2 RX Controller"
+       depends on VIDEO_V4L2
        depends on MEDIA_CONTROLLER
        depends on VIDEO_V4L2_SUBDEV_API
        select V4L2_FWNODE
@@ -22,6 +23,7 @@ config VIDEO_CADENCE_CSI2RX
 
 config VIDEO_CADENCE_CSI2TX
        tristate "Cadence MIPI-CSI2 TX Controller"
+       depends on VIDEO_V4L2
        depends on MEDIA_CONTROLLER
        depends on VIDEO_V4L2_SUBDEV_API
        select V4L2_FWNODE