On Mon, Jul 9, 2012 at 6:55 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote: > * Tony Lindgren <tony@xxxxxxxxxxx> [120709 06:17]: >> * Vaibhav Hiremath <hvaibhav@xxxxxx> [120709 01:55]: >> > On 7/6/2012 2:51 PM, Santosh Shilimkar wrote: >> > > --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h >> > > +++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h >> > > @@ -39,6 +39,7 @@ struct omap_clk { >> > > #define CK_443X (1 << 11) >> > > #define CK_TI816X (1 << 12) >> > > #define CK_446X (1 << 13) >> > > +#define CK_54XX (1 << 14) >> > >> > This is conflicting with AM33XX, you may want to rebase it again, since >> > AM33xx clock tree is already pushed and available in >> > linux-omap/devel-am33xx-part2. >> >> Heh these CK_XXXX defines are now running out of the u16 cpu_mask. >> >> They really should be replaced with SoC specific lists of clocks >> rather than bloating the cpu_mask and repeating it for every clock >> that's compiled in for 800+ times. >> >> Below (untested) is what could be done in the short term. >> >> I wonder if we could #define CK_OMAP_DUMMY 0 that's always set >> for non-shared clocks if they only get set in some *_data.c >> file in a unique way? >> >> Paul got any better ideas? > > Santosh, I suggest you just drop the CK_54XX change from your patches > as the clock fwk support will need further patching and is not used > yet. > Good idea. Will have a look at it. Regards Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html