lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap: n8x0: Cleanup i2c1 and menelaus registration

Browse Source 
- 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: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Jarkko Nikula
2010-08-20 09:36:28 +03:00
committed by Tony Lindgren
parent ca828760f9
commit a7f97d25c7
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/mach-omap2/board-n8x0.c
View File

@@ -614,29 +614,24 @@ static int n8x0_menelaus_late_init(struct device *dev)
return 0; 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, .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; I2C_BOARD_INFO("menelaus", 0x72),
omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1, .irq = INT_24XX_SYS_NIRQ,
ARRAY_SIZE(n8x0_i2c_board_info_1)); .platform_data = &n8x0_menelaus_platform_data,
} },
};
#else
static inline void __init n8x0_menelaus_init(void)
{
}
#endif
static void __init n8x0_map_io(void) static void __init n8x0_map_io(void)
{ {
@@ -665,9 +660,10 @@ static void __init n8x0_init_machine(void)
/* FIXME: add n810 spi devices */ /* FIXME: add n810 spi devices */
spi_register_board_info(n800_spi_board_info, spi_register_board_info(n800_spi_board_info,
ARRAY_SIZE(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(); omap_serial_init();
n8x0_menelaus_init();
n8x0_onenand_init(); n8x0_onenand_init();
n8x0_mmc_init(); n8x0_mmc_init();
n8x0_usb_init(); n8x0_usb_init();