[PATCH] [media] staging: allow omap4iss to be modular

Arnd Bergmann arnd at arndb.de
Thu Jun 12 07:28:39 PDT 2014


On Thursday 12 June 2014 07:25:15 Greg KH wrote:
> On Thu, Jun 12, 2014 at 04:15:32PM +0200, Arnd Bergmann wrote:
> > On Thursday 12 June 2014 16:12:17 Laurent Pinchart wrote:
> > > > From 3a965f4fd5a6b3ef4a66aa4e7c916cfd34fd5706 Mon Sep 17 00:00:00 2001
> > > > From: Arnd Bergmann <arnd at arndb.de>
> > > > Date: Tue, 21 Jan 2014 09:32:43 +0100
> > > > Subject: [PATCH] [media] staging: tighten omap4iss dependencies
> > > > 
> > > > The OMAP4 camera support depends on I2C and VIDEO_V4L2, both
> > > > of which can be loadable modules. This causes build failures
> > > > if we want the camera driver to be built-in.
> > > > 
> > > > This can be solved by turning the option into "tristate",
> > > > which unfortunately causes another problem, because the
> > > > driver incorrectly calls a platform-internal interface
> > > > for omap4_ctrl_pad_readl/omap4_ctrl_pad_writel.
> > > > 
> > > > Instead, this patch just forbids the invalid configurations
> > > > and ensures that the driver can only be built if all its
> > > > dependencies are built-in.
> > > > 
> > > > Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> > > 
> > > Acked-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> > > 
> > > Should I take this in my tree for v3.17 or would you like to fast-track it ?
> > > 
> > 
> > I'd actually like to see it in 3.15 as a stable backport if possible,
> 
> It's not stable material, sorry.

To clarify, I was talking about second version of the patch,
not the original one. It just does this:

>  config VIDEO_OMAP4
>       bool "OMAP 4 Camera support"
> -     depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C && ARCH_OMAP4
> +     depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4
>       select VIDEOBUF2_DMA_CONTIG
>       ---help---
>         Driver for an OMAP 4 ISS controller.

which enforces that configurations that cannot be compiled
will not be selectable in Kconfig, so we can have allmodconfig
working. I thought that was ok for -stable.

> > but definitely in 3.16. What is the normal path for staging/media
> > but fix patches?
> 
> Through Mauro's tree.

Ok.

	Arnd



More information about the linux-arm-kernel mailing list