Merge branch 'devel-gpio' into omap-for-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / board-n8x0.c

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index d8a489338e0c2887ebb5100426b52ccbf1ab01c4..d4ce96316e3bc26621609497aae9d04572bc771f 100644 (file)
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -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) &&                                                \
@@ -652,8 +644,6 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init n8x0_init_machine(void)
@@ -670,7 +660,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();
 }