From: Tony Lindgren <tony@atomide.com>
Date: Wed, 11 Nov 2009 02:10:34 +0000 (-0800)
Subject: Merge branch '7xx-iosplit-plat' with omap-fixes
X-Git-Tag: firefly_0821_release~9833^2~3961^2~69^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=774facda20d2f8f0f61fa312d8028dad18ac5ee4;p=firefly-linux-kernel-4.4.55.git

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

774facda20d2f8f0f61fa312d8028dad18ac5ee4
diff --cc arch/arm/mach-omap1/serial.c
index d23979bc0fd5,0e3c507cc44d..5ebf0946c76a
--- 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 0acb5560229c,607845b7207f..a2abac98c569
--- a/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-ldp.c
index d57ec2f4d0a9,5c825607543e..c062238fe881
--- a/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 4c4d7f8dbd72,f6f8592258f9..522ff6288c6f
--- a/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 5326e0d61597,d6bcfaab94ca..5a38494bf066
--- a/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 e34d96a825e3,9e16d90021d3..cf4583a5d284
--- 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 <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 78869a9a1cc2,060245e14740..f1e7e5bbf985
--- a/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 ea00486a5e53,56f9d8436323..4ad9b94ed4ae
--- a/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/plat-omap/include/plat/keypad.h
index 000000000000,d91b9be334ff..3ae52ccc793c
mode 000000,100644..100644
--- a/arch/arm/plat-omap/include/plat/keypad.h
+++ b/arch/arm/plat-omap/include/plat/keypad.h
@@@ -1,0 -1,42 +1,45 @@@
+ /*
+  *  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
+ 
 -#include <linux/input/matrix_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
+