Re: linux-next: manual merge of the omap tree with Linus' tree

[Tony Lindgren]

* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> [091029 17:46]:
> Hi all,
> 
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap1/serial.c between commit
> c33da3a80074094303d643a90ef589330b491270 ("omap1: Fix redundant UARTs pin
> muxing that can break other hardware support") from Linus' tree and
> commits 84f90c9cc81d8db172d4f768fc4010f508897366 ("omap: Change low-level
> serial init to use ioremap") and acb1aed4a5f23c545073b0d65302e5949f239fa0
> ("omap: Eliminate OMAP_MAX_NR_PORTS") from the omap tree.
> 
> I fixed it up (see below) and can carry the fix for a while.

Thanks, will rebase omap for-next patches today.

Regards,

Tony

> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc arch/arm/mach-omap1/serial.c
> index d23979b,f82f66e..0000000
> --- a/arch/arm/mach-omap1/serial.c
> +++ b/arch/arm/mach-omap1/serial.c
> @@@ -130,7 -120,17 +120,15 @@@ void __init omap_serial_init(void
>   		serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
>   	}
>   
> - 	for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
> + 	for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) {
>  -		unsigned char reg;
>  -
> + 		/* Static mapping, never released */
> + 		serial_platform_data[i].membase =
> + 			ioremap(serial_platform_data[i].mapbase, SZ_2K);
> + 		if (!serial_platform_data[i].membase) {
> + 			printk(KERN_ERR "Could not ioremap uart%i\n", i);
> + 			continue;
> + 		}
> + 
>   		switch (i) {
>   		case 0:
>   			uart1_ck = clk_get(NULL, "uart1_ck");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/