From: Tony Lindgren Date: Wed, 11 Nov 2009 02:10:34 +0000 (-0800) Subject: Merge branch '7xx-iosplit-plat' with omap-fixes X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=774facda20d2f8f0f61fa312d8028dad18ac5ee4;p=linux-edison.git Merge branch '7xx-iosplit-plat' with omap-fixes --- 774facda20d2f8f0f61fa312d8028dad18ac5ee4 diff --cc arch/arm/mach-omap1/serial.c index d23979bc0fd,0e3c507cc44..5ebf0946c76 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@@ -131,6 -121,16 +121,14 @@@ void __init omap_serial_init(void } for (i = 0; i < OMAP_MAX_NR_PORTS; 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"); diff --cc arch/arm/mach-omap2/board-3430sdp.c index 0acb5560229,607845b7207..a2abac98c56 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@@ -30,16 -29,17 +30,16 @@@ #include #include - #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include + #include - #include - #include + #include -#include + #include #include "sdram-qimonda-hyb18m512160af-6.h" #include "mmc-twl4030.h" diff --cc arch/arm/mach-omap2/board-ldp.c index d57ec2f4d0a,5c825607543..c062238fe88 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@@ -33,15 -32,16 +33,15 @@@ #include #include - #include + #include #include - #include - #include - #include + #include + #include + #include #include - #include - #include + #include + #include -#include #include "mmc-twl4030.h" diff --cc arch/arm/mach-omap2/board-omap3evm.c index 4c4d7f8dbd7,f6f8592258f..522ff6288c6 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@@ -33,11 -32,12 +33,11 @@@ #include #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include -#include #include "sdram-micron-mt46h32m32lf-6.h" #include "mmc-twl4030.h" diff --cc arch/arm/mach-omap2/board-omap3pandora.c index 5326e0d6159,d6bcfaab94c..5a38494bf06 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@@ -34,13 -33,14 +34,13 @@@ #include #include - #include - #include + #include + #include #include #include - #include - #include - #include + #include + #include -#include + #include #include "sdram-micron-mt46h32m32lf-6.h" #include "mmc-twl4030.h" diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c index e34d96a825e,9e16d90021d..cf4583a5d28 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@@ -22,14 -21,15 +22,14 @@@ #include #include - #include - #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include -#include + #include + #include #include "mmc-twl4030.h" diff --cc arch/arm/mach-omap2/board-rx51.c index 78869a9a1cc,060245e1474..f1e7e5bbf98 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@@ -22,13 -22,14 +22,13 @@@ #include #include - #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include -#include + #include + #include + #include static struct omap_lcd_config rx51_lcd_config = { .ctrl_name = "internal", diff --cc arch/arm/mach-omap2/board-zoom2.c index ea00486a5e5,56f9d843632..4ad9b94ed4a --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@@ -21,8 -20,9 +21,8 @@@ #include #include - #include - #include + #include + #include -#include #include "mmc-twl4030.h" #include "sdram-micron-mt46h32m32lf-6.h"