UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: onenand: omap: use pdata info instead of cpu_is 

platform data now contains a field to indicate whether
soc belongs to omap34xx family, use it instead of
cpu_is_* check.

This helps in removing dependency of platform specific
header file - cpu.h

Signed-off-by: Afzal Mohammed <afzal@ti.com>
This commit is contained in:
Afzal Mohammed 2012-10-05 11:43:19 +05:30
parent eb77b6a78a
commit b7754452b3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/onenand/omap2.c
View File

@ -42,7 +42,6 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/cpu.h>
#define DRIVER_NAME "omap2-onenand" #define DRIVER_NAME "omap2-onenand"
@ -62,6 +61,7 @@ struct omap2_onenand {
int freq; int freq;
int (*setup)(void __iomem *base, int *freq_ptr); int (*setup)(void __iomem *base, int *freq_ptr);
struct regulator *regulator; struct regulator *regulator;
u8 flags;
}; };
static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data) static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data)
@ -154,7 +154,7 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state)
if (!(syscfg & ONENAND_SYS_CFG1_IOBE)) { if (!(syscfg & ONENAND_SYS_CFG1_IOBE)) {
syscfg |= ONENAND_SYS_CFG1_IOBE; syscfg |= ONENAND_SYS_CFG1_IOBE;
write_reg(c, syscfg, ONENAND_REG_SYS_CFG1); 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 */ /* Add a delay to let GPIO settle */
syscfg = read_reg(c, ONENAND_REG_SYS_CFG1); syscfg = read_reg(c, ONENAND_REG_SYS_CFG1);
} }
@ -638,6 +638,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
init_completion(&c->irq_done); init_completion(&c->irq_done);
init_completion(&c->dma_done); init_completion(&c->dma_done);
c->flags = pdata->flags;
c->gpmc_cs = pdata->cs; c->gpmc_cs = pdata->cs;
c->gpio_irq = pdata->gpio_irq; c->gpio_irq = pdata->gpio_irq;
c->dma_channel = pdata->dma_channel; c->dma_channel = pdata->dma_channel;
@ -728,7 +729,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
this = &c->onenand; this = &c->onenand;
if (c->dma_channel >= 0) { if (c->dma_channel >= 0) {
this->wait = omap2_onenand_wait; this->wait = omap2_onenand_wait;
if (cpu_is_omap34xx()) { if (c->flags & ONENAND_IN_OMAP34XX) {
this->read_bufferram = omap3_onenand_read_bufferram; this->read_bufferram = omap3_onenand_read_bufferram;
this->write_bufferram = omap3_onenand_write_bufferram; this->write_bufferram = omap3_onenand_write_bufferram;
} else { } else {