* Felipe Balbi <[email protected]> [090111 00:21]:
> On Sun, Jan 11, 2009 at 01:30:54AM +0530, Sanjeev Premi wrote:
> > Added runtime check via omap2_set_globals_35xx()
> >
> > Signed-off-by: Sanjeev Premi <[email protected]>
> > ---
> > arch/arm/plat-omap/common.c | 68 +++++++++++++++++++++++
> > arch/arm/plat-omap/include/mach/common.h | 1 +
> > arch/arm/plat-omap/include/mach/cpu.h | 88
> > +++++++++++++++++++++++++++++-
> > 3 files changed, 155 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
> > index 8c53125..7861a25 100644
> > --- a/arch/arm/plat-omap/common.c
> > +++ b/arch/arm/plat-omap/common.c
> > @@ -333,3 +333,71 @@ void __init omap2_set_globals_343x(void)
> > }
> > #endif
> >
> > +#if defined(CONFIG_ARCH_OMAP35XX)
> > +
> > +#if defined(CONFIG_ARCH_OMAP3503)
>
> use ifdef here
>
> > +static struct omap_globals omap3503_globals = {
> > + .class = OMAP35XX_CLASS,
> > + .tap = OMAP2_IO_ADDRESS(0x4830A000),
> > + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),
> > + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),
> > + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),
> > + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),
> > + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),
> > +};
> > +#endif /* if defined(CONFIG_ARCH_OMAP3503) */
>
> traditionaly this would be:
>
> #endif /* CONFIG_ARCH_OMAP3503 */
>
> but that's a matter of taste...
>
> > +
> > +#if defined(CONFIG_ARCH_OMAP3515)
>
> and here
>
> > +static struct omap_globals omap3515_globals = {
> > + .class = OMAP35XX_CLASS,
> > + .tap = OMAP2_IO_ADDRESS(0x4830A000),
> > + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),
> > + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),
> > + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),
> > + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),
> > + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),
> > +};
> > +#endif /* if defined(CONFIG_ARCH_OMAP3515) */
> > +
> > +#if defined(CONFIG_ARCH_OMAP3525)
> > +static struct omap_globals omap3525_globals = {
> > + .class = OMAP35XX_CLASS,
> > + .tap = OMAP2_IO_ADDRESS(0x4830A000),
> > + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),
> > + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),
> > + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),
> > + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),
> > + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),
> > +};
> > +#endif /* if defined(CONFIG_ARCH_OMAP3525) */
> > +
> > +#if defined(CONFIG_ARCH_OMAP3530)
> > +static struct omap_globals omap3530_globals = {
> > + .class = OMAP35XX_CLASS,
> > + .tap = OMAP2_IO_ADDRESS(0x4830A000),
> > + .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE),
> > + .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE),
> > + .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE),
> > + .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE),
> > + .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE),
> > +};
> > +#endif /* if defined(CONFIG_ARCH_OMAP3530) */
What are the differences between these various omap35xx
processors? Maybe add a comment to each struct.
Also do we really need a separate struct for each 35xx?
> > +
> > +void __init omap2_set_globals_35xx(void)
> > +{
> > +#if defined(CONFIG_ARCH_OMAP3503)
> > + omap2_globals = &omap3503_globals;
> > +#endif
> > +#if defined(CONFIG_ARCH_OMAP3515)
> > + omap2_globals = &omap3515_globals;
> > +#endif
> > +#if defined(CONFIG_ARCH_OMAP3525)
> > + omap2_globals = &omap3525_globals;
> > +#endif
> > +#if defined(CONFIG_ARCH_OMAP3530)
> > + omap2_globals = &omap3530_globals;
> > +#endif
>
> hmmm... so it's impossible to have multi-omap with 35xx ??
> too bad...
This does not sounds right, the multi-omap should always work.
> You should probably provide omap2_set_globals_350x(),
> omap2_set_globals_351x(), omap2_set_globals_352x() and
> omap2_set_globals_353x().
>
> Tony, what do you think ??
Is there no way to detect them during runtime from the hardware?
If the answer is no, then yes we need a separate set_globals for
each omap35xx flavor.
Regards,
Tony
--
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
