| Message ID | EAF47CD23C76F840A9E7FCE10091EFAB02BADABC8A@dbde02.ent.ti.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
Op 26 sep 2009, om 10:09 heeft Shilimkar, Santosh het volgende geschreven: > 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. I can confirm the above and ISTR that the regbits are autogenerated if so, does someone have the script for that? regards, Koen -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
After some googling: omap: Fix 44xx compile http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commitdiff;h=61f04ee83c768c556168b09d71f0dc87b4a6090a It would be nice to have that in master as well :) Op 28 sep 2009, om 11:02 heeft Koen Kooi het volgende geschreven: > > Op 26 sep 2009, om 10:09 heeft Shilimkar, Santosh het volgende > geschreven: > >> 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. > > I can confirm the above and ISTR that the regbits are autogenerated > if so, does someone have the script for that? > > regards, > > Koen > -- > To unsubscribe from this list: send the line "unsubscribe linux- > omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 @@ -109,16 +109,6 @@ static struct plat_serial8250_port serial_platform_data2[] = { .regshift = 2, .uartclk = OMAP24XX_BASE_BAUD * 16, }, { -#ifdef CONFIG_ARCH_OMAP4 - .membase = 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 } }; @@ -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, },