On Mon, Mar 30, 2009 at 10:32:08PM -0700, Kevin Hilman wrote:
> "Mark A. Greer" <[email protected]> writes:
> 
> > From: Mark A. Greer <[email protected]>
> >
> > Add support for the DA830/OMAP-L137 Evaluation Module (EVM
> > from TI.  The EVM has User Interface (UI) and Audio cards
> > that can be connected that contain various devices.
> > Support for those devices and ones on the EVM will be
> > added in subsequent patches.
> >
> > Signed-off-by: Mark A. Greer <[email protected]>
> 
> [...]
> 
> > diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S 
> > b/arch/arm/mach-davinci/include/mach/debug-macro.S
> > index de3fc21..c45a8ad 100644
> > --- a/arch/arm/mach-davinci/include/mach/debug-macro.S
> > +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S
> > @@ -24,7 +24,14 @@
> >             tst     \rx, #1                 @ MMU enabled?
> >             moveq   \rx, #0x01000000        @ physical base address
> >             movne   \rx, #0xfe000000        @ virtual base
> > +#if defined(CONFIG_ARCH_DAVINCI_DA830_EVM) && 
> > defined(CONFIG_ARCH_DAVINCI_TRUE)
> > +#error Cannot enable DaVinci and DA830 platforms concurrently
> > +#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM)
> > +           orr     \rx, \rx, #0x00d00000   @ physical base address
> > +           orr     \rx, \rx, #0x0000d000   @ physical base address
> > +#else
> >             orr     \rx, \rx, #0x00c20000   @ UART 0
> > +#endif
> >             .endm
> >  
> 
> Thinking of ways to get rid of this restricion...
> 
> Since this code is in the zImage and not the kernel image, what if we
> use head-davinci.S to set a global variable for based on the machine
> number (r7) for UART0 base, then use that variable here.

The wrapper code side is easy BUT its also included in the kernel
(kernel/debug.S).  And very early in the kernel...before we know
what h/w we're on. See 2) in the description in 16/18.

If you can think of something let me know because I can't.

I suppose we could stealthily pass the uart addr from the wrapper
to the kernel via an unused reg.  I don't know what rmk would think
of that.

Ug, device trees good. ;)

Mark
--

_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to