Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/pm34xx.c
	drivers/mtd/nand/omap2.c
	drivers/mtd/onenand/omap2.c

diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 2abbd6a,5ad0901..3e8725b
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -32,11 -32,11 +32,11 @@@
  
  #include <plat/usb.h>
  #include "common.h"
 -#include <plat/dma.h>
 -#include "gpmc.h"
 +#include <plat-omap/dma-omap.h>
- #include <plat/gpmc.h>
  #include <video/omapdss.h>
  #include <video/omap-panel-tfp410.h>
  
++#include "gpmc.h"
  #include "gpmc-smc91x.h"
  
  #include "board-flash.h"

diff --cc arch/arm/mach-omap2/board-h4.c
index b3bab62,65ebf58..366ebd9
--- 1/arch/arm/mach-omap2/board-h4.c
--- 2/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -32,8 -32,7 +32,7 @@@
  #include <asm/mach/map.h>
  
  #include <plat/menelaus.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
- #include <plat/gpmc.h>
  #include "debug-devices.h"
  
  #include <video/omapdss.h>

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 38b3f63,42b6056..c2eed84
--- 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
@@@ -31,8 -31,8 +31,7 @@@
  #include <asm/system_info.h>
  
  #include "common.h"
 -#include <plat/dma.h>
 -#include "gpmc.h"
 +#include <plat-omap/dma-omap.h>
- #include <plat/gpmc.h>
  #include <plat/omap-pm.h>
  #include "gpmc-smc91x.h"
  
@@@ -54,6 -54,7 +53,8 @@@
  #include "mux.h"
  #include "hsmmc.h"
  #include "common-board-devices.h"
++#include "gpmc.h"
+ #include "gpmc-onenand.h"
  
  #define SYSTEM_REV_B_USES_VAUX3       0x1699
  #define SYSTEM_REV_S_USES_VAUX3 0x8

diff --cc arch/arm/mach-omap2/board-rx51.c
index 3b1c03e,88ba5be..63b33c6
--- 1/arch/arm/mach-omap2/board-rx51.c
--- 2/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -23,12 -23,12 +23,12 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
--#include "common.h"
 -#include <plat/dma.h>
 -#include "gpmc.h"
 +#include <plat-omap/dma-omap.h>
- #include <plat/gpmc.h>
  #include <plat/usb.h>
  
++#include "common.h"
  #include "mux.h"
++#include "gpmc.h"
  #include "pm.h"
  #include "sdram-nokia.h"
  

diff --cc arch/arm/mach-omap2/pm34xx.c
index baee872,ed98f4f..001eff2
--- 1/arch/arm/mach-omap2/pm34xx.c
--- 2/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -40,12 -40,12 +40,12 @@@
  #include "powerdomain.h"
  #include <plat/sdrc.h>
  #include <plat/prcm.h>
- #include <plat/gpmc.h>
 -#include "gpmc.h"
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
  
  #include "common.h"
  #include "cm2xxx_3xxx.h"
  #include "cm-regbits-34xx.h"
++#include "gpmc.h"
  #include "prm-regbits-34xx.h"
  
  #include "prm2xxx_3xxx.h"

diff --cc drivers/mtd/nand/omap2.c
index 2cbdb8e,3282b15..5c8978e
--- 1/drivers/mtd/nand/omap2.c
--- 2/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@@ -27,8 -27,7 +27,7 @@@
  #include <linux/bch.h>
  #endif
  
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
- #include <plat/gpmc.h>
  #include <linux/platform_data/mtd-nand-omap2.h>
  
  #define       DRIVER_NAME     "omap2-nand"
@@@ -110,9 -110,12 +110,14 @@@
  #define       ECC1RESULTSIZE                  0x1
  #define       ECCCLEAR                        0x100
  #define       ECC1                            0x1
+ #define       PREFETCH_FIFOTHRESHOLD_MAX      0x40
+ #define       PREFETCH_FIFOTHRESHOLD(val)     ((val) << 8)
+ #define       PREFETCH_STATUS_COUNT(val)      (val & 0x00003fff)
+ #define       PREFETCH_STATUS_FIFO_CNT(val)   ((val >> 24) & 0x7F)
+ #define       STATUS_BUFF_EMPTY               0x00000001
  
 +#define OMAP24XX_DMA_GPMC             4
 +
  /* oob info generated runtime depending on ecc algorithm and layout selected */
  static struct nand_ecclayout omap_oobinfo;
  /* Define some generic bad / good block scan pattern which are used

diff --cc drivers/mtd/onenand/omap2.c
index b846eaf,959f465..53069ae
--- 1/drivers/mtd/onenand/omap2.c
--- 2/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@@ -41,9 -41,7 +41,7 @@@
  #include <linux/platform_data/mtd-onenand-omap2.h>
  #include <asm/gpio.h>
  
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
- #include <plat/cpu.h>
  
  #define DRIVER_NAME "omap2-onenand"