diff options
| author | Aaro Koskinen <Aaro.Koskinen@nokia.com> | 2010-12-02 15:51:24 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-02 17:06:45 -0800 |
| commit | 5403187f83c12c6f4c03547e0cc05bac0310be7b (patch) | |
| tree | 80d6792223da89c00db4b51afb100280dfc19e7b /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | a1a92e6fccadbba1846a081f21d0c12a10addd56 (diff) | |
| download | talos-obmc-linux-5403187f83c12c6f4c03547e0cc05bac0310be7b.tar.gz talos-obmc-linux-5403187f83c12c6f4c03547e0cc05bac0310be7b.zip | |
arm: mach-omap2: rx51: clean up dummy onenand init
When OneNAND support is disabled, the platform code defines NULL
board_onenand_data and empty init function for us. By utilizing this we
can avoid cluttering board files with dummy definitions/wrappers.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 3fda20d73233..126b724a5e2d 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -817,25 +817,15 @@ static struct mtd_partition onenand_partitions[] = { }, }; -static struct omap_onenand_platform_data board_onenand_data = { - .cs = 0, - .gpio_irq = 65, - .parts = onenand_partitions, - .nr_parts = ARRAY_SIZE(onenand_partitions), - .flags = ONENAND_SYNC_READWRITE, +static struct omap_onenand_platform_data board_onenand_data[] = { + { + .cs = 0, + .gpio_irq = 65, + .parts = onenand_partitions, + .nr_parts = ARRAY_SIZE(onenand_partitions), + .flags = ONENAND_SYNC_READWRITE, + } }; - -static void __init board_onenand_init(void) -{ - gpmc_onenand_init(&board_onenand_data); -} - -#else - -static inline void board_onenand_init(void) -{ -} - #endif #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) @@ -918,7 +908,7 @@ error: void __init rx51_peripherals_init(void) { rx51_i2c_init(); - board_onenand_init(); + gpmc_onenand_init(board_onenand_data); board_smc91x_init(); rx51_add_gpio_keys(); rx51_init_wl1251(); |
