Skip to content

Commit

Permalink
arm: mach-omap2: rx51: clean up dummy onenand init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aaro Koskinen authored and Tony Lindgren committed Dec 3, 2010
1 parent a1a92e6 commit 5403187
Showing 1 changed file with 9 additions and 19 deletions.
28 changes: 9 additions & 19 deletions arch/arm/mach-omap2/board-rx51-peripherals.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -918,7 +908,7 @@ static void __init rx51_init_wl1251(void)
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();
Expand Down

0 comments on commit 5403187

Please sign in to comment.