Mauro, there's a question for you below. On Wed, 30 Jun 2010, Uwe Kleine-König wrote: > Hi Guennadi, > > On Wed, Jun 30, 2010 at 09:20:36AM +0200, Guennadi Liakhovetski wrote: > > > > --- a/arch/arm/plat-mxc/include/mach/memory.h > > > > +++ b/arch/arm/plat-mxc/include/mach/memory.h > > > > @@ -44,12 +44,12 @@ > > > > */ > > > > #define CONSISTENT_DMA_SIZE SZ_8M > > > > > > > > -#elif defined(CONFIG_MX1_VIDEO) > > > > +#elif defined(CONFIG_MX1_VIDEO) || defined(CONFIG_MX2_VIDEO) > > > > /* > > > > * Increase size of DMA-consistent memory region. > > > > * This is required for i.MX camera driver to capture at least four VGA frames. > > > > */ > > > > #define CONSISTENT_DMA_SIZE SZ_4M > > > > -#endif /* CONFIG_MX1_VIDEO */ > > > > +#endif /* CONFIG_MX1_VIDEO || CONFIG_MX2_VIDEO */ > > > Why not use CONFIG_VIDEO_MX2 here and get rid of CONFIG_MX2_VIDEO? > > > > Well, firstly for uniformity with MX1 and MX3, > Using a common scheme for names on all platforms is fine, but if the > existing names are bad better establish a nicer scheme. > > > secondly not to have to use > > (CONFIG_VIDEO_MX2 || CONFIG_VIDEO_MX2_MODULE), > ah, didn't notice that MX?_VIDEO is bool while VIDEO_MX? is tristate. > That's fine. Still I would prefer a better naming that doesn't force > having to look up which variable is for the driver and which is for the > arch stuff. > > > also note, that > > CONFIG_MX1_VIDEO is also used for linking of the FIQ handler for the camera. > This is just a matter of fixing the corresponding Makefile. So, you call a change like # Support for CMOS sensor interface -obj-$(CONFIG_MX1_VIDEO) += ksym_mx1.o mx1_camera_fiq.o +ifneq ($(CONFIG_VIDEO_MX1),) +obj-y += ksym_mx1.o mx1_camera_fiq.o +endif a fix?... In any case, I'm fine with the patch as it is, so, here's Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> I think, it would be better if you, Uwe, or Sascha pull all these 3 patches via one of your tree, because patches 2/3 and 3/3 are ARM/MX2 stuff anyway and this patch changes some files under arch/arm and collides with some mx2 changes. Mauro, do you agree? Do we need your ack too? So, taking them all via IMX/MXC would make synchronisation easier. However, if you change anything under drivers/media (including Makefile / Kconfig) or include/media, please let me know, so that I can ack it again. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
