[PATCH v2] media: i2c: imx214: select V4L2_FWNODE

[PATCH v2] media: i2c: imx214: select V4L2_FWNODE

[Jacopo Mondi]

From: Jacopo Mondi <jacopo+renesas@jmondi.org>

After the recent conversion of the media build infrastructure to select
V4L2 components instead of depending on their presence, which took place
in:
32a363d0b0b14 ("media: Kconfig files: use select for V4L2 subdevs and MC")

imx214 stands out as being the (only?) media I2C driver that still depends
on a V4L2 core symbol instead of selecting it.

This confuses the build system which claims it has detected a circular
dependency when other drivers select the same symbol as the imx214
driver does.

drivers/media/i2c/Kconfig:728:error: recursive dependency detected!
drivers/media/i2c/Kconfig:728:	symbol VIDEO_IMX214 depends on V4L2_FWNODE
drivers/media/v4l2-core/Kconfig:71:	symbol V4L2_FWNODE is selected by VIDEO_BCM2835_UNICAM
drivers/media/platform/bcm2835/Kconfig:3:	symbol VIDEO_BCM2835_UNICAM depends on VIDEO_V4L2_SUBDEV_API
drivers/media/v4l2-core/Kconfig:19:	symbol VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER
drivers/media/Kconfig:168:	symbol MEDIA_CONTROLLER is selected by VIDEO_IMX214

Fix this by making the imx214 driver select V4L2_FWNODE instead of
depending on it and align it with all the other drivers.

Fixes: 32a363d0b0b14 ("media: Kconfig files: use select for V4L2 subdevs and MC")
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
 drivers/media/i2c/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index da11036ad804d..6b1a6851ccb0b 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -728,7 +728,7 @@ config VIDEO_HI556
 config VIDEO_IMX214
 	tristate "Sony IMX214 sensor support"
 	depends on GPIOLIB && I2C && VIDEO_V4L2
-	depends on V4L2_FWNODE
+	select V4L2_FWNODE
 	select MEDIA_CONTROLLER
 	select VIDEO_V4L2_SUBDEV_API
 	select REGMAP_I2C
--
2.27.0

Re: [PATCH v2] media: i2c: imx214: select V4L2_FWNODE

[Laurent Pinchart]

Hi Sakari, Mauro,

Could we get this merged ? It fixes a v5.8 regression. It's obviously
too late for v5.8, can we merge it as a v5.9 fix ?

On Mon, Jun 22, 2020 at 06:43:52PM +0200, Jacopo Mondi wrote:
> From: Jacopo Mondi <jacopo+renesas@jmondi.org>
> 
> After the recent conversion of the media build infrastructure to select
> V4L2 components instead of depending on their presence, which took place
> in:
> 32a363d0b0b14 ("media: Kconfig files: use select for V4L2 subdevs and MC")
> 
> imx214 stands out as being the (only?) media I2C driver that still depends
> on a V4L2 core symbol instead of selecting it.
> 
> This confuses the build system which claims it has detected a circular
> dependency when other drivers select the same symbol as the imx214
> driver does.
> 
> drivers/media/i2c/Kconfig:728:error: recursive dependency detected!
> drivers/media/i2c/Kconfig:728:	symbol VIDEO_IMX214 depends on V4L2_FWNODE
> drivers/media/v4l2-core/Kconfig:71:	symbol V4L2_FWNODE is selected by VIDEO_BCM2835_UNICAM
> drivers/media/platform/bcm2835/Kconfig:3:	symbol VIDEO_BCM2835_UNICAM depends on VIDEO_V4L2_SUBDEV_API
> drivers/media/v4l2-core/Kconfig:19:	symbol VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER
> drivers/media/Kconfig:168:	symbol MEDIA_CONTROLLER is selected by VIDEO_IMX214
> 
> Fix this by making the imx214 driver select V4L2_FWNODE instead of
> depending on it and align it with all the other drivers.
> 
> Fixes: 32a363d0b0b14 ("media: Kconfig files: use select for V4L2 subdevs and MC")
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> ---
>  drivers/media/i2c/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index da11036ad804d..6b1a6851ccb0b 100644
> --- a/drivers/media/i2c/Kconfig
> +++ b/drivers/media/i2c/Kconfig
> @@ -728,7 +728,7 @@ config VIDEO_HI556
>  config VIDEO_IMX214
>  	tristate "Sony IMX214 sensor support"
>  	depends on GPIOLIB && I2C && VIDEO_V4L2
> -	depends on V4L2_FWNODE
> +	select V4L2_FWNODE
>  	select MEDIA_CONTROLLER
>  	select VIDEO_V4L2_SUBDEV_API
>  	select REGMAP_I2C

-- 
Regards,

Laurent Pinchart

Re: [PATCH v2] media: i2c: imx214: select V4L2_FWNODE

[Sakari Ailus]

On Thu, Aug 13, 2020 at 12:49:28AM +0300, Laurent Pinchart wrote:
> Hi Sakari, Mauro,
> 
> Could we get this merged ? It fixes a v5.8 regression. It's obviously
> too late for v5.8, can we merge it as a v5.9 fix ?

Yes.

-- 
Sakari Ailus