diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:41:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:41:03 -0700 |
| commit | c81592ba1b012d555d0cb7ec711afda89c327469 (patch) | |
| tree | 44e36c4785fc6169b971922097d7b3941101b3e1 /arch/arm/plat-omap/include/mach/onenand.h | |
| parent | c912f7e1eae169aaca333b4c5da3f36c98f2ccb0 (diff) | |
| parent | 088962c243db42b9c608f30be3e3a05a5b696895 (diff) | |
Merge branch 'omap-upstream' into for-next
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/plat-omap/include/mach/onenand.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/onenand.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/onenand.h b/arch/arm/plat-omap/include/mach/onenand.h index 4649d302c263..72f433d7d827 100644 --- a/arch/arm/plat-omap/include/mach/onenand.h +++ b/arch/arm/plat-omap/include/mach/onenand.h @@ -9,8 +9,12 @@ * published by the Free Software Foundation. */ +#include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#define ONENAND_SYNC_READ (1 << 0) +#define ONENAND_SYNC_READWRITE (1 << 1) + struct omap_onenand_platform_data { int cs; int gpio_irq; @@ -18,8 +22,22 @@ struct omap_onenand_platform_data { int nr_parts; int (*onenand_setup)(void __iomem *, int freq); int dma_channel; + u8 flags; }; -int omap2_onenand_rephase(void); - #define ONENAND_MAX_PARTITIONS 8 + +#if defined(CONFIG_MTD_ONENAND_OMAP2) || \ + defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) + +extern void gpmc_onenand_init(struct omap_onenand_platform_data *d); + +#else + +#define board_onenand_data NULL + +static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d) +{ +} + +#endif |