Merge branch '7xx-iosplit-plat' with omap-fixes

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmte.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmtt.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmz71.c
Simple merge

diff --cc arch/arm/mach-omap1/board-sx1.c
Simple merge

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap1/serial.c
index d23979bc0fd52aebce992a9caa34e897d9fc877b,0e3c507cc44d867ed6e6be5d615c89ca9beb6300..5ebf0946c76a9990cffa2db50fb49856bbfe5263
--- 1/arch/arm/mach-omap1/serial.c
--- 2/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 0acb5560229c349ba66fa2327e838a9d4409a8d0,607845b7207f28fda819fae7f7bcd7e003fc1e13..a2abac98c56927c6f776b35993ba1325af13f5a9
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -30,16 -29,17 +30,16 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/usb.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/usb.h>
+ #include <plat/common.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
  
- #include <mach/control.h>
- #include <mach/gpmc-smc91x.h>
+ #include <plat/control.h>
 -#include <plat/keypad.h>
+ #include <plat/gpmc-smc91x.h>
  
  #include "sdram-qimonda-hyb18m512160af-6.h"
  #include "mmc-twl4030.h"

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
index d57ec2f4d0a9a85f94024e3bee816df68f24012f,5c825607543eb9c2deb714b459e1df4d472c9bfd..c062238fe88144c1d81c949d0ac28c2a2f3b2cf3
--- 1/arch/arm/mach-omap2/board-ldp.c
--- 2/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -33,15 -32,16 +33,15 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/mcspi.h>
+ #include <plat/mcspi.h>
  #include <mach/gpio.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/gpmc.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
+ #include <plat/gpmc.h>
  
  #include <asm/delay.h>
- #include <mach/control.h>
- #include <mach/usb.h>
+ #include <plat/control.h>
+ #include <plat/usb.h>
 -#include <plat/keypad.h>
  
  #include "mmc-twl4030.h"
  

diff --cc arch/arm/mach-omap2/board-omap3evm.c
index 4c4d7f8dbd7236cf6d33afa2eee8748e9d78e357,f6f8592258f9af5a5365bdaf506b8c2eeb3062a4..522ff6288c6f122a063b0e2c89edb4efa32d2e9d
--- 1/arch/arm/mach-omap2/board-omap3evm.c
--- 2/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -33,11 -32,12 +33,11 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/board.h>
- #include <mach/mux.h>
- #include <mach/usb.h>
- #include <mach/common.h>
- #include <mach/mcspi.h>
+ #include <plat/board.h>
+ #include <plat/mux.h>
+ #include <plat/usb.h>
+ #include <plat/common.h>
+ #include <plat/mcspi.h>
 -#include <plat/keypad.h>
  
  #include "sdram-micron-mt46h32m32lf-6.h"
  #include "mmc-twl4030.h"

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index 5326e0d61597725aab8da89f930383f6d9400a16,d6bcfaab94ca8ed1fa4de2ee8c746a388277e478..5a38494bf066b95481395e2517d3c7e61e7bf9b1
--- 1/arch/arm/mach-omap2/board-omap3pandora.c
--- 2/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -34,13 -33,14 +34,13 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/board.h>
- #include <mach/common.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
  #include <mach/gpio.h>
  #include <mach/hardware.h>
- #include <mach/mcspi.h>
- #include <mach/usb.h>
- #include <mach/mux.h>
+ #include <plat/mcspi.h>
+ #include <plat/usb.h>
 -#include <plat/keypad.h>
+ #include <plat/mux.h>
  
  #include "sdram-micron-mt46h32m32lf-6.h"
  #include "mmc-twl4030.h"

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index e34d96a825e3a60259a48cbd6dd92a3f79499881,9e16d90021d381fb1f64cac27761656e98db0738..cf4583a5d284eb3af3680a6bdfdac43882efc53d
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -22,14 -21,15 +22,14 @@@
  #include <linux/gpio.h>
  #include <linux/mmc/host.h>
  
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
- #include <mach/onenand.h>
- #include <mach/gpmc-smc91x.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
 -#include <plat/keypad.h>
+ #include <plat/onenand.h>
+ #include <plat/gpmc-smc91x.h>
  
  #include "mmc-twl4030.h"
  

diff --cc arch/arm/mach-omap2/board-rx51.c
index 78869a9a1cc24700786549c23af8993f2b293d3a,060245e1474005241b2679482c9fa4378660e4bc..f1e7e5bbf9854d3b653d992333a645da66a32610
--- 1/arch/arm/mach-omap2/board-rx51.c
--- 2/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -22,13 -22,14 +22,13 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
- #include <mach/usb.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
 -#include <plat/keypad.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
+ #include <plat/usb.h>
  
  static struct omap_lcd_config rx51_lcd_config = {
        .ctrl_name      = "internal",

diff --cc arch/arm/mach-omap2/board-zoom2.c
index ea00486a5e5314b5e5255a7c3aa9d4a9af306960,56f9d8436323a03fbc9cbf8e2c881278994f2fc0..4ad9b94ed4aead064315e3dd15c07c22cd36b574
--- 1/arch/arm/mach-omap2/board-zoom2.c
--- 2/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@@ -21,8 -20,9 +21,8 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  
- #include <mach/common.h>
- #include <mach/usb.h>
+ #include <plat/common.h>
+ #include <plat/usb.h>
 -#include <plat/keypad.h>
  
  #include "mmc-twl4030.h"
  #include "sdram-micron-mt46h32m32lf-6.h"

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/keypad.h
index 0000000000000000000000000000000000000000,d91b9be334ff2ff1b80078f95c1d805c0d278224..3ae52ccc793c5d7d47e8913738691902f6c882b2
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/plat-omap/include/plat/keypad.h
+++ b/arch/arm/plat-omap/include/plat/keypad.h
@@@ -1,0 -1,42 +1,45 @@@
 -#include <linux/input/matrix_keypad.h>
+ /*
+  *  arch/arm/plat-omap/include/mach/keypad.h
+  *
+  *  Copyright (C) 2006 Komal Shah <komal_shah802003@yahoo.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  */
+ #ifndef ASMARM_ARCH_KEYPAD_H
+ #define ASMARM_ARCH_KEYPAD_H
+ 
++#warning: Please update the board to use matrix_keypad.h instead
+ 
+ struct omap_kp_platform_data {
+       int rows;
+       int cols;
+       int *keymap;
+       unsigned int keymapsize;
+       unsigned int rep:1;
+       unsigned long delay;
+       unsigned int dbounce:1;
+       /* specific to OMAP242x*/
+       unsigned int *row_gpios;
+       unsigned int *col_gpios;
+ };
+ 
+ /* Group (0..3) -- when multiple keys are pressed, only the
+  * keys pressed in the same group are considered as pressed. This is
+  * in order to workaround certain crappy HW designs that produce ghost
+  * keypresses. */
+ #define GROUP_0               (0 << 16)
+ #define GROUP_1               (1 << 16)
+ #define GROUP_2               (2 << 16)
+ #define GROUP_3               (3 << 16)
+ #define GROUP_MASK    GROUP_3
+ 
+ #define KEY_PERSISTENT                0x00800000
+ #define KEYNUM_MASK           0x00EFFFFF
++#define KEY(col, row, val) (((col) << 28) | ((row) << 24) | (val))
++#define PERSISTENT_KEY(col, row) (((col) << 28) | ((row) << 24) | \
++                                              KEY_PERSISTENT)
+ 
+ #endif
+ 

diff --cc arch/arm/plat-omap/iommu.c
Simple merge

diff --cc drivers/mfd/twl4030-core.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge