Re: [PATCH] omap2/3/4: serial: Half revert multiboot changes

[Tony Lindgren <tony@atomide.com>]

* Aguirre, Sergio <saaguirre@ti.com> [100223 23:37]:
> Hmm..
> 
> I think I sent this patch too soon...
> 
> Please ignore it, this is not a proper solution I feel..
> 
> But what it is true... is that, patch "omap2/3/4: Fix mach-omap2/serial.c for multiboot" is definitely breaking Zoom3 boot, and needs to be fixed.

Yes sounds like only zoom has the external uart, other 3630
boards may be using the internal uart4.
 
> I'll try to come up with a better patch.

You can call omap_serial_init_port() for each port from
board-zoom3.c instead of calling omap_serial_init().

See commit

Regards,

Tony

 
> Regards,
> Sergio
> 
> > -----Original Message-----
> > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> > owner@vger.kernel.org] On Behalf Of Aguirre, Sergio
> > Sent: Wednesday, February 24, 2010 1:31 AM
> > To: Tony Lindgren
> > Cc: linux-omap@vger.kernel.org; Sonasath, Moiz; Pandita, Vikram
> > Subject: [PATCH] omap2/3/4: serial: Half revert multiboot changes
> > 
> > From 14bc4ee14ac5a3dab79d9292bf22ab0401879cd5 Mon Sep 17 00:00:00 2001
> > From: Sergio Aguirre <saaguirre@ti.com>
> > Date: Wed, 24 Feb 2010 01:15:55 -0600
> > Subject: [PATCH] omap2/3/4: serial: Half revert multiboot changes
> > 
> > The patch named:
> >   "omap2/3/4: Fix mach-omap2/serial.c for multiboot"
> > 
> > Which added UART4 init also for 36xx based boards, broke zoom3
> > booting. External UART must be correctly initialized already
> > by board-zoom-debugboard.c file, therefore the addition on UART4
> > initialization can't be done blindly (i.e. board agnostic)
> > 
> > This patch removes the 36xx uart4 init for the above reason.
> > 
> > Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
> > ---
> >  arch/arm/mach-omap2/serial.c |   10 ++--------
> >  1 files changed, 2 insertions(+), 8 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> > index b79bc89..fe3122b 100644
> > --- a/arch/arm/mach-omap2/serial.c
> > +++ b/arch/arm/mach-omap2/serial.c
> > @@ -115,7 +115,6 @@ static struct plat_serial8250_port
> > serial_platform_data2[] = {
> >  	}
> >  };
> > 
> > -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> >  static struct plat_serial8250_port serial_platform_data3[] = {
> >  	{
> >  		.irq		= 70,
> > @@ -132,11 +131,6 @@ static inline void omap2_set_globals_uart4(struct
> > omap_globals *omap2_globals)
> >  {
> >  	serial_platform_data3[0].mapbase = omap2_globals->uart4_phys;
> >  }
> > -#else
> > -static inline void omap2_set_globals_uart4(struct omap_globals
> > *omap2_globals)
> > -{
> > -}
> > -#endif
> > 
> >  void __init omap2_set_globals_uart(struct omap_globals *omap2_globals)
> >  {
> > @@ -597,7 +591,7 @@ static struct omap_uart_state omap_uart[] = {
> >  			},
> >  		},
> >  	},
> > -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> > +#ifdef CONFIG_ARCH_OMAP4
> >  	{
> >  		.pdev = {
> >  			.name			= "serial8250",
> > @@ -764,7 +758,7 @@ void __init omap_serial_init(void)
> >  {
> >  	int i, nr_ports;
> > 
> > -	if (!(cpu_is_omap3630() || cpu_is_omap4430()))
> > +	if (!cpu_is_omap4430())
> >  		nr_ports = 3;
> >  	else
> >  		nr_ports = ARRAY_SIZE(omap_uart);
> > --
> > 1.6.3.3
>