Hi Tony, On Thursday 29 November 2012 08:29:27 Tony Lindgren wrote: > * Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> [121129 01:37]: > > On Thursday 29 November 2012 11:30:28 Tomi Valkeinen wrote: > > > On 2012-11-28 17:13, Laurent Pinchart wrote: > > > > On Monday 12 November 2012 15:33:38 Tomi Valkeinen wrote: > > > >> Hi, > > > >> > > > >> This patch removes use of cpu_is_* funcs from omap_vout, and uses > > > >> omapdss's version instead. The other patch removes an unneeded > > > >> plat/dma.h include. > > > >> > > > >> These are based on current omapdss master branch, which has the > > > >> omapdss version code. The omapdss version code is queued for v3.8. > > > >> I'm not sure which is the best way to handle these patches due to the > > > >> dependency to omapdss. The easiest option is to merge these for 3.9. > > > >> > > > >> There's still the OMAP DMA use in omap_vout_vrfb.c, which is the last > > > >> OMAP dependency in the omap_vout driver. I'm not going to touch that, > > > >> as it doesn't look as trivial as this cpu_is_* removal, and I don't > > > >> have much knowledge of the omap_vout driver. > > > >> > > > >> Compiled, but not tested. > > > > > > > > Tested on a Beagleboard-xM. > > > > > > > > Tested-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > > > Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > > > > > Thanks. > > > > > > > The patches depend on unmerged OMAP DSS patches. Would you like to > > > > push this series through linuxtv or through your DSS tree ? The later > > > > might be easier, depending on when the required DSS patches will hit > > > > mainline. > > > > > > The DSS patches will be merged for 3.8. I can take this via the omapdss > > > tree, as there probably won't be any conflicts with other v4l2 stuff. > > > > > > Or, we can just delay these until 3.9. These patches remove omap > > > platform dependencies, helping the effort to get common ARM kernel. > > > However, as there's still the VRFB code in the omap_vout driver, the > > > dependency remains. Thus, in way, these patches alone don't help > > > anything, and we could delay these for 3.9 and hope that > > > omap_vout_vrfb.c gets converted also for that merge window. > > > > OK, I'll queue them for v3.9 then. > > Please rather queue the cpu_is_omap removal to v3.8 so I can > remove plat/cpu.h for omap2+. In that case the patches should go through the DSS tree. Mauro, are you fine with that ? -- Regards, Laurent Pinchart -- 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
