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

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index b846eafa2f09..53069aef1f48 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -38,12 +38,10 @@
 #include <linux/regulator/consumer.h>
 
 #include <asm/mach/flash.h>
-#include <plat/gpmc.h>
 #include <linux/platform_data/mtd-onenand-omap2.h>
 #include <asm/gpio.h>
 
 #include <plat-omap/dma-omap.h>
-#include <plat/cpu.h>
 
 #define DRIVER_NAME "omap2-onenand"
 
@@ -63,6 +61,7 @@ struct omap2_onenand {
         int freq;
         int (*setup)(void __iomem *base, int *freq_ptr);
         struct regulator *regulator;
+        u8 flags;
 };
 
 static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data)
@@ -155,7 +154,7 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state)
                 if (!(syscfg & ONENAND_SYS_CFG1_IOBE)) {
                         syscfg |= ONENAND_SYS_CFG1_IOBE;
                         write_reg(c, syscfg, ONENAND_REG_SYS_CFG1);
-                        if (cpu_is_omap34xx())
+                        if (c->flags & ONENAND_IN_OMAP34XX)
                                 /* Add a delay to let GPIO settle */
                                 syscfg = read_reg(c, ONENAND_REG_SYS_CFG1);
                 }
@@ -639,6 +638,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 
         init_completion(&c->irq_done);
         init_completion(&c->dma_done);
+        c->flags = pdata->flags;
         c->gpmc_cs = pdata->cs;
         c->gpio_irq = pdata->gpio_irq;
         c->dma_channel = pdata->dma_channel;
@@ -729,7 +729,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
         this = &c->onenand;
         if (c->dma_channel >= 0) {
                 this->wait = omap2_onenand_wait;
-                if (cpu_is_omap34xx()) {
+                if (c->flags & ONENAND_IN_OMAP34XX) {
                         this->read_bufferram = omap3_onenand_read_bufferram;
                         this->write_bufferram = omap3_onenand_write_bufferram;
                 } else {
@@ -803,7 +803,6 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
         }
         iounmap(c->onenand.base);
         release_mem_region(c->phys_base, c->mem_size);
-        gpmc_cs_free(c->gpmc_cs);
         kfree(c);
 
         return 0;