Russell,
> > diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> > index 916fcd3..6db7791 100644
> > --- a/arch/arm/mach-omap2/io.c
> > +++ b/arch/arm/mach-omap2/io.c
> > @@ -200,7 +247,9 @@ void __init omap2_init_common_hw(struct
> omap_sdrc_params *sp)
> > omap2_mux_init();
> > pwrdm_init(powerdomains_omap);
> > clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);
> > +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the
> clkdev is ready */
> > omap2_clk_init();
> > +#endif
> > omap2_sdrc_init(sp);
> > gpmc_init();
> > }
>
> I'm not sure why:
>
> 1. you're using a (possible) run time check in sdrc.c,
> clockdomain.c and
> powerdomain.c, but a compile time check in io.c
This one I explained in the last email. And till we have the clean up done on
clock.h I can't remove the compile time switch even though it looks ugly.
> 2. you don't leave sdrc.c, clockdomain.c and powerdomain.c
> alone and just
> disable the three initialisation calls inside
> omap2_init_common_hw().
My initial patch actually had the compile time option but Kevin and Tony had a
opinion to stub these respective files for OMAP4.
Is something like this acceptable then ?
void __init omap2_init_common_hw(struct omap_sdrc_params *sp)
{
omap2_mux_init();
if (!cpu_is_omap44xx()) {
pwrdm_init(powerdomains_omap);
clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);
}
#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Ones the framework is available */
omap2_clk_init();
#endif
if (!cpu_is_omap44xx())
omap2_sdrc_init(sp);
gpmc_init();
}
With this I don't need to stub sdrc.c, clockdomain.c and powerdomain.c for OMAP4
Regards,
Santosh
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
