> -----Original Message----- > From: Tony Lindgren [mailto:[email protected]] > Sent: Wednesday, September 30, 2009 11:25 PM > To: Shilimkar, Santosh > Cc: [email protected] > Subject: Re: linux-omap git tree updated to v2.6.32-rc1, important changes, > please read > > Hi, > > * Shilimkar, Santosh <[email protected]> [090929 03:54]: > > <snip> > > > Thanks for fixing the OMAP4 compilation issues. We need below patch to > make the kernel boot on OMAP4430 on the latest LO master. > > No problem. In the future, let's make sure the omap4 patches are merged > into l-o master branch for testing. This time the first three patches > in the omap-fixes branch were build breakage caused by the omap4 patches > directly or indirectly.. Agree!! > Also, please everybody check that your patches don't break the build > for other the omaps, and also boot test on some other omaps if someting > looks risky. > > Few comments below. > > > > > From d9a22d9f7b68b99aa9607bdab377d998dfe82acd Mon Sep 17 00:00:00 2001 > > From: Santosh Shilimkar <[email protected]> > > Date: Tue, 29 Sep 2009 16:10:46 +0530 > > Subject: [PATCH] ARM: OMAP4: Allow omap_serial_early_init() for OMAP4430 > board > > > > This patch enables omap_serial_early_init() function for OMAP4430 > > SDP. Without this the bootup would throw opps in omap_serial_init(). > > The opps probably should be oops above :)
YEP :) > > Additionally the patch removed the merge issue for the UART4. > > > > Signed-off-by: Santosh Shilimkar <[email protected]> > > --- > > arch/arm/mach-omap2/board-4430sdp.c | 4 ++-- > > arch/arm/mach-omap2/io.c | 2 ++ > > arch/arm/mach-omap2/serial.c | 10 ---------- > > 3 files changed, 4 insertions(+), 12 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach- > omap2/board-4430sdp.c > > index eb37c40..609a5a4 100644 > > --- a/arch/arm/mach-omap2/board-4430sdp.c > > +++ b/arch/arm/mach-omap2/board-4430sdp.c > > @@ -58,6 +58,8 @@ static void __init gic_init_irq(void) > > > > static void __init omap_4430sdp_init_irq(void) > > { > > + omap_board_config = sdp4430_config; > > + omap_board_config_size = ARRAY_SIZE(sdp4430_config); > > omap2_init_common_hw(NULL, NULL); > > #ifdef CONFIG_OMAP_32K_TIMER > > omap2_gp_clockevent_set_gptimer(1); > > @@ -70,8 +72,6 @@ static void __init omap_4430sdp_init_irq(void) > > static void __init omap_4430sdp_init(void) > > { > > platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); > > - omap_board_config = sdp4430_config; > > - omap_board_config_size = ARRAY_SIZE(sdp4430_config); > > omap_serial_init(); > > } > > > > diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c > > index e3a3bad..56be87d 100644 > > --- a/arch/arm/mach-omap2/io.c > > +++ b/arch/arm/mach-omap2/io.c > > @@ -302,7 +302,9 @@ void __init omap2_init_common_hw(struct > omap_sdrc_params *sdrc_cs0, > > pwrdm_init(powerdomains_omap); > > clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); > > omap2_clk_init(); > > +#endif > > omap_serial_early_init(); > > +#ifndef CONFIG_ARCH_OMAP4 > > omap_hwmod_late_init(); > > omap_pm_if_init(); > > omap2_sdrc_init(sdrc_cs0, sdrc_cs1); > > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > > index ae21868..54dfeb5 100644 > > --- a/arch/arm/mach-omap2/serial.c > > +++ b/arch/arm/mach-omap2/serial.c > > @@ -109,16 +109,6 @@ static struct plat_serial8250_port > serial_platform_data2[] = { > > .regshift = 2, > > .uartclk = OMAP24XX_BASE_BAUD * 16, > > }, { > > -#ifdef CONFIG_ARCH_OMAP4 > > - .membase = OMAP2_IO_ADDRESS(OMAP_UART4_BASE), > > - .mapbase = OMAP_UART4_BASE, > > - .irq = 70, > > - .flags = UPF_BOOT_AUTOCONF, > > - .iotype = UPIO_MEM, > > - .regshift = 2, > > - .uartclk = OMAP24XX_BASE_BAUD * 16, > > - }, { > > -#endif > > .flags = 0 > > } > > }; > > Can't we fix the extra uart instead of removing it? We just added it! > It's still there in omap4, right? This is already fixed. Above piece is not necessary since there is a separate instance for UART4 (serial_platform_data3[]) 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
