Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f97d25 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Tony Lindgren
Browse files

omap: n8x0: Cleanup i2c1 and menelaus registration 



- Move n8x0_i2c_board_info_1 out from #ifdef CONFIG_MENELAUS block,
  register i2c1 in n8x0_init_machine and do a few clean-ups around these.
  Code looks better if board infos are grouped together
- Mark n8x0_i2c_board_info_1 and n8x0_menelaus_platform_data with __initdata

Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ca828760

arch/arm/mach-omap2/board-n8x0.c

+15 −19
Original line number Diff line number Diff line
@@ -614,29 +614,24 @@ static int n8x0_menelaus_late_init(struct device *dev) 
	return 0;

}



static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] = {

#else

static int n8x0_menelaus_late_init(struct device *dev)

{

		I2C_BOARD_INFO("menelaus", 0x72),

		.irq = INT_24XX_SYS_NIRQ,

	},

};

	return 0;

}

#endif



static struct menelaus_platform_data n8x0_menelaus_platform_data = {

static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {

	.late_init = n8x0_menelaus_late_init,

};



static void __init n8x0_menelaus_init(void)

static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {

	{

	n8x0_i2c_board_info_1[0].platform_data = &n8x0_menelaus_platform_data;

	omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,

			      ARRAY_SIZE(n8x0_i2c_board_info_1));

}



#else

static inline void __init n8x0_menelaus_init(void)

{

}

#endif

		I2C_BOARD_INFO("menelaus", 0x72),

		.irq = INT_24XX_SYS_NIRQ,

		.platform_data = &n8x0_menelaus_platform_data,

	},

};



static void __init n8x0_map_io(void)

{
@@ -665,9 +660,10 @@ static void __init n8x0_init_machine(void) 
	/* FIXME: add n810 spi devices */

	spi_register_board_info(n800_spi_board_info,

				ARRAY_SIZE(n800_spi_board_info));

	omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,

			      ARRAY_SIZE(n8x0_i2c_board_info_1));



	omap_serial_init();

	n8x0_menelaus_init();

	n8x0_onenand_init();

	n8x0_mmc_init();

	n8x0_usb_init();