| Message ID | 20210105152852.5733-5-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx: Miscellaneous fixes and cleanups for i.MX7 | expand |
Hi Laurent, On Tue, 2021-01-05 at 17:27 +0200, Laurent Pinchart wrote: > The i.MX7 camera drivers, selected by VIDEO_IMX7_CSI, don't depend on > IMX_IPUV3_CORE. Move the dependency from the common VIDEO_IMX_MEDIA > symbol to VIDEO_IMX_CSI. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/staging/media/imx/Kconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig > index ce270627a7c4..0f1277a58d3c 100644 > --- a/drivers/staging/media/imx/Kconfig > +++ b/drivers/staging/media/imx/Kconfig > @@ -4,7 +4,7 @@ config VIDEO_IMX_MEDIA > depends on ARCH_MXC || COMPILE_TEST > depends on HAS_DMA > depends on VIDEO_DEV > - depends on VIDEO_V4L2 && IMX_IPUV3_CORE > + depends on VIDEO_V4L2 > select MEDIA_CONTROLLER > select V4L2_FWNODE > select V4L2_MEM2MEM_DEV > @@ -19,6 +19,7 @@ menu "i.MX5/6/7 Media Sub devices" > > config VIDEO_IMX_CSI > tristate "i.MX5/6 Camera Sensor Interface driver" > + depends on IMX_IPUV3_CORE > default y > help > A video4linux camera sensor interface driver for i.MX5/6. This patch drops the IMX_IPUV3_CORE dependency from VIDEO_IMX_MEDIA, which still tries to build imx6-media.ko (and will fail if IMX_IPUV3_CORE is disabled) until the following patch. Would it make sense to squash this with the following patch for better bisectability? regards Philipp
Hi Philipp, On Wed, Jan 06, 2021 at 03:24:58PM +0100, Philipp Zabel wrote: > On Tue, 2021-01-05 at 17:27 +0200, Laurent Pinchart wrote: > > The i.MX7 camera drivers, selected by VIDEO_IMX7_CSI, don't depend on > > IMX_IPUV3_CORE. Move the dependency from the common VIDEO_IMX_MEDIA > > symbol to VIDEO_IMX_CSI. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > drivers/staging/media/imx/Kconfig | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig > > index ce270627a7c4..0f1277a58d3c 100644 > > --- a/drivers/staging/media/imx/Kconfig > > +++ b/drivers/staging/media/imx/Kconfig > > @@ -4,7 +4,7 @@ config VIDEO_IMX_MEDIA > > depends on ARCH_MXC || COMPILE_TEST > > depends on HAS_DMA > > depends on VIDEO_DEV > > - depends on VIDEO_V4L2 && IMX_IPUV3_CORE > > + depends on VIDEO_V4L2 > > select MEDIA_CONTROLLER > > select V4L2_FWNODE > > select V4L2_MEM2MEM_DEV > > @@ -19,6 +19,7 @@ menu "i.MX5/6/7 Media Sub devices" > > > > config VIDEO_IMX_CSI > > tristate "i.MX5/6 Camera Sensor Interface driver" > > + depends on IMX_IPUV3_CORE > > default y > > help > > A video4linux camera sensor interface driver for i.MX5/6. > > This patch drops the IMX_IPUV3_CORE dependency from VIDEO_IMX_MEDIA, > which still tries to build imx6-media.ko (and will fail if > IMX_IPUV3_CORE is disabled) until the following patch. > > Would it make sense to squash this with the following patch for better > bisectability? Yes it does, I'll do so in v2.
diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig index ce270627a7c4..0f1277a58d3c 100644 --- a/drivers/staging/media/imx/Kconfig +++ b/drivers/staging/media/imx/Kconfig @@ -4,7 +4,7 @@ config VIDEO_IMX_MEDIA depends on ARCH_MXC || COMPILE_TEST depends on HAS_DMA depends on VIDEO_DEV - depends on VIDEO_V4L2 && IMX_IPUV3_CORE + depends on VIDEO_V4L2 select MEDIA_CONTROLLER select V4L2_FWNODE select V4L2_MEM2MEM_DEV @@ -19,6 +19,7 @@ menu "i.MX5/6/7 Media Sub devices" config VIDEO_IMX_CSI tristate "i.MX5/6 Camera Sensor Interface driver" + depends on IMX_IPUV3_CORE default y help A video4linux camera sensor interface driver for i.MX5/6.
The i.MX7 camera drivers, selected by VIDEO_IMX7_CSI, don't depend on IMX_IPUV3_CORE. Move the dependency from the common VIDEO_IMX_MEDIA symbol to VIDEO_IMX_CSI. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/staging/media/imx/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)