From: "Shilimkar, Santosh" <[email-masked]>

Tony,
OMAP4430 board build is breaking on the latest mainline head because of couple of issues.
1. The serial.c merge conflict issue below wasn't fixed correctly :(
Related link:
http://article.gmane.org/gmane.linux.ports.arm.omap/23341

2. Pauls below series breaks build as well. 
[PATCH 00/13] OMAP PM, clock,	and SDRC updates for the 2.6.32 merge window

Paul,
Can you fix the same please? I don't have the correct " cm-regbits-4xxx.h" file to generate the patch. 

***************************************************
CC      arch/arm/mach-omap2/control.o
  CC      arch/arm/mach-omap2/mux.o
  CC      arch/arm/mach-omap2/devices.o
  CC      arch/arm/mach-omap2/serial.o
  CC      arch/arm/mach-omap2/gpmc.o
  CC      arch/arm/mach-omap2/timer-gp.o
  CC      arch/arm/mach-omap2/omap-smp.o
  AS      arch/arm/mach-omap2/omap-headsmp.o
  CC      arch/arm/mach-omap2/timer-mpu.o
  CC      arch/arm/mach-omap2/cm4xxx.o
arch/arm/mach-omap2/cm4xxx.c:25:29: error: cm-regbits-4xxx.h: No such file or directory
arch/arm/mach-omap2/cm4xxx.c: In function 'omap4_cm_wait_idlest_ready':
arch/arm/mach-omap2/cm4xxx.c:61: error: implicit declaration of function 'omap4_cm_read_mod_reg'
arch/arm/mach-omap2/cm4xxx.c:62: error: 'OMAP4_CM_CLKCTRL_DREG' undeclared (first use in this function)
arch/arm/mach-omap2/cm4xxx.c:62: error: (Each undeclared identifier is reported only once
arch/arm/mach-omap2/cm4xxx.c:62: error: for each function it appears in.)
make[1]: *** [arch/arm/mach-omap2/cm4xxx.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

*****************************************************

Tony,
Patch regarding one 1. is below.

From 3abd16f9b81dc55a2d894175d4a75f5a40c0fdd5 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email-masked]>
Date: Sat, 26 Sep 2009 13:07:39 +0530
Subject: [PATCH] ARM: OMAP4: Fix build break because of merge conflict

On the latest mainline head 2.6.31 (commit:6d7f18f6), OMAP4430 board
build is broken. This was mainly because of merge conflict which wasn't
resolved correctly.

The related patch and issue was discussed here.
http://article.gmane.org/gmane.linux.ports.arm.omap/23341

Signed-off-by: Santosh Shilimkar <[email-masked]>
Cc: Kevin Hilman <[email-masked]>
Cc: Tony Lindgren <[email-masked]>
---
 arch/arm/mach-omap2/serial.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 3a529c7..54dfeb5 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -126,7 +116,7 @@ static struct plat_serial8250_port serial_platform_data2[] = {
 #ifdef CONFIG_ARCH_OMAP4
 static struct plat_serial8250_port serial_platform_data3[] = {
 	{
-		.membase	= IO_ADDRESS(OMAP_UART4_BASE),
+		.membase	= OMAP2_IO_ADDRESS(OMAP_UART4_BASE),
 		.mapbase	= OMAP_UART4_BASE,
 		.irq		= 70,
 		.flags		= UPF_BOOT_AUTOCONF,
@@ -579,7 +569,7 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
 	{
 		.pdev = {
 			.name			= "serial8250",
-			.id			= 3
+			.id			= 3,
 			.dev			= {
 				.platform_data	= serial_platform_data3,
 			},
-- 
1.5.4.7

Thanks !!

Regards,
Santosh

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email-masked]
More majordomo info at  http://vger.kernel.org/majordomo-info.html