Merge branch '7xx-iosplit-plat' with omap-fixes
Tony Lindgren [Wed, 11 Nov 2009 02:10:34 +0000 (18:10 -0800)]
25 files changed:
1  2 
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/serial.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-zoom2.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/serial.c
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/include/plat/keypad.h
arch/arm/plat-omap/iommu.c
drivers/mfd/twl4030-core.c
drivers/mmc/host/omap_hsmmc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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");
  #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"
Simple merge
  #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"
  
  #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"
  #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"
  #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"
  
  #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",
@@@ -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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge