Tony, > > --- a/arch/arm/mach-omap2/io.c > > +++ b/arch/arm/mach-omap2/io.c > > @@ -30,6 +32,7 @@ > > #include <mach/sdrc.h> > > #include <mach/gpmc.h> > > > > +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once > clkdev is ready */ > > #include "clock.h" > > > > #include <mach/powerdomain.h> > > Maybe move this part to your clk stub patch? > > > @@ -198,9 +244,11 @@ void __init omap2_map_common_io(void) > > void __init omap2_init_common_hw(struct omap_sdrc_params *sp) > > { > > omap2_mux_init(); > > +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the > clkdev is ready */ > > pwrdm_init(powerdomains_omap); > > clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); > > omap2_clk_init(); > > omap2_sdrc_init(sp); > > +#endif > > gpmc_init(); > > } > > And this too? What you are saying here is create dummy functions for above in clock.c. The problem is you still can't get completely rid off the #define in this file. At least as you know the #include "clock.h" needs to be compiled out. Another possibility is not to compile 'arch/arm/mach-omap2/io.c' for omap4 but that would make Makefile dirty and also I need to move 'struct map_desc omap44xx_io_desc[] __initdata ' and 'iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc))' to clock.c under define. I think for time being we can keep this because anyways coming omap4 clkdev patches would remove this. > > + if (cpu_is_omap44xx()) > > + period = 0xFF; /* FIXME: */ > One more hex 0xFF to lower case here. Maybe grep your patches for 0x > and lower case them for consistent hex addresses? This was the only place where it was uppercase :) Not sure whether you want new patch for this but I have just attached with just above one correction. Regards, Santosh
Attachment:
0001-ARM-OMAP4-Add-minimal-support-for-omap4.patch
Description: 0001-ARM-OMAP4-Add-minimal-support-for-omap4.patch