Merge tags 'omap-devel-gpmc-fixed-for-v3.7' and 'cleanup-omap-tags-for-v3.7' into...

Changes for GPMC (General Purpose Memory Controller) that take it
closer for being just a regular device driver.

Remove the ancient omap specific atags that are no longer needed.

At some point we were planning to pass the bootloader information
with custom atags that did not work out too well.

There's no need for these any longer as the kernel has been booting
fine without them for quite some time. And Now we have device tree
support that can be used instead.

diff --cc arch/arm/mach-omap2/gpmc-nand.c
index 386dec8,045596a,513ed9e..96fcc64
--- 1/arch/arm/mach-omap2/gpmc-nand.c
--- 2/arch/arm/mach-omap2/gpmc-nand.c
--- 3/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@@@ -18,11 -18,19 -18,10 +18,18 @@@@
   
   #include <plat/cpu.h>
   #include <plat/nand.h>
-- #include <plat/board.h>
   #include <plat/gpmc.h>
   
- -static struct resource gpmc_nand_resource = {
- -     .flags          = IORESOURCE_MEM,
+ +static struct resource gpmc_nand_resource[] = {
+ +     {
+ +             .flags          = IORESOURCE_MEM,
+ +     },
+ +     {
+ +             .flags          = IORESOURCE_IRQ,
+ +     },
+ +     {
+ +             .flags          = IORESOURCE_IRQ,
+ +     },
   };
   
   static struct platform_device gpmc_nand_device = {

diff --cc arch/arm/mach-omap2/gpmc-onenand.c
index a0fa9bb,71d7c07,c5f005e..b12a39e
--- 1/arch/arm/mach-omap2/gpmc-onenand.c
--- 2/arch/arm/mach-omap2/gpmc-onenand.c
--- 3/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/arch/arm/mach-omap2/gpmc-onenand.c
@@@@ -20,11 -20,17 -20,10 +20,16 @@@@
   
   #include <plat/cpu.h>
   #include <plat/onenand.h>
-- #include <plat/board.h>
   #include <plat/gpmc.h>
   
+ +#define      ONENAND_IO_SIZE SZ_128K
+ +
   static struct omap_onenand_platform_data *gpmc_onenand_data;
   
+ +static struct resource gpmc_onenand_resource = {
+ +     .flags          = IORESOURCE_MEM,
+ +};
+ +
   static struct platform_device gpmc_onenand_device = {
        .name           = "omap2-onenand",
        .id             = -1,

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

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc drivers/mtd/onenand/omap2.c
index 398a827,3ff893d,10ed992..108ab1a
--- 1/drivers/mtd/onenand/omap2.c
--- 2/drivers/mtd/onenand/omap2.c
--- 3/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@@@ -44,11 -44,10 -44,9 +44,8 @@@@
   
   #include <plat/dma.h>
   
-- #include <plat/board.h>
-- 
   #define DRIVER_NAME "omap2-onenand"
   
- -#define ONENAND_IO_SIZE              SZ_128K
   #define ONENAND_BUFRAM_SIZE  (1024 * 5)
   
   struct omap2_onenand {