Skip to content

Commit

Permalink
arm: mach-omap2: n8x0: 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 7203f8a commit a1a92e6
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions arch/arm/mach-omap2/board-n8x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,23 +184,15 @@ static struct mtd_partition onenand_partitions[] = {
},
};

static struct omap_onenand_platform_data board_onenand_data = {
.cs = 0,
.gpio_irq = 26,
.parts = onenand_partitions,
.nr_parts = ARRAY_SIZE(onenand_partitions),
.flags = ONENAND_SYNC_READ,
static struct omap_onenand_platform_data board_onenand_data[] = {
{
.cs = 0,
.gpio_irq = 26,
.parts = onenand_partitions,
.nr_parts = ARRAY_SIZE(onenand_partitions),
.flags = ONENAND_SYNC_READ,
}
};

static void __init n8x0_onenand_init(void)
{
gpmc_onenand_init(&board_onenand_data);
}

#else

static void __init n8x0_onenand_init(void) {}

#endif

#if defined(CONFIG_MENELAUS) && \
Expand Down Expand Up @@ -669,7 +661,7 @@ static void __init n8x0_init_machine(void)
ARRAY_SIZE(n810_i2c_board_info_2));

omap_serial_init();
n8x0_onenand_init();
gpmc_onenand_init(board_onenand_data);
n8x0_mmc_init();
n8x0_usb_init();
}
Expand Down

0 comments on commit a1a92e6

Please sign in to comment.