summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorGrazvydas Ignotas <notasas@gmail.com>2011-06-03 19:56:33 +0000
committerTony Lindgren <tony@atomide.com>2011-06-29 01:11:37 -0700
commit7a559c7882db55c7a40dab19ea43ad747a51185a (patch)
treedd28f74188fa81f857491215a4e4c099137e770b /arch/arm/plat-omap
parentfd4a0286cecd3b1e15771e02bc36bd8494a4a1d8 (diff)
downloadblackbird-op-linux-7a559c7882db55c7a40dab19ea43ad747a51185a.tar.gz
blackbird-op-linux-7a559c7882db55c7a40dab19ea43ad747a51185a.zip
omap: cleanup NAND platform data
omap_nand_platform_data fields 'options', 'gpio_irq', 'nand_setup' and 'dma_channel' are never referenced by the NAND driver, yet various board files are initializing those fields. This is both incorrect and confusing, so remove them. This allows to get rid of a global variable in gpmc-nand.c. This also corrects an issue where some boards are trying to pass NAND 16bit flag through .options, but the driver is using .devsize instead and ignoring .options. Finally, .dev_ready is treated as a flag by the driver, so make it bool instead of a function pointer. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/nand.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/include/plat/nand.h b/arch/arm/plat-omap/include/plat/nand.h
index d86d1ecf0068..67fc5060183e 100644
--- a/arch/arm/plat-omap/include/plat/nand.h
+++ b/arch/arm/plat-omap/include/plat/nand.h
@@ -19,15 +19,11 @@ enum nand_io {
};
struct omap_nand_platform_data {
- unsigned int options;
int cs;
- int gpio_irq;
struct mtd_partition *parts;
struct gpmc_timings *gpmc_t;
int nr_parts;
- int (*nand_setup)(void);
- int (*dev_ready)(struct omap_nand_platform_data *);
- int dma_channel;
+ bool dev_ready;
int gpmc_irq;
enum nand_io xfer_type;
unsigned long phys_base;
OpenPOWER on IntegriCloud