From 4791b6edc7a7e740e53dbb50b3968d907c339c06 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Fri, 20 Aug 2010 09:36:28 +0300 Subject: [PATCH] --- yaml --- r: 216889 b: refs/heads/master c: 366498d4f2aef7640ae467a986d69d1cc06a141b h: refs/heads/master i: 216887: eab21fe969942755054cab6c0e0c150df04b27d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-n8x0.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 134b663c37c0..1b87ef428944 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7f97d25c707e1020bd7bcb443e183860e5abf48 +refs/heads/master: 366498d4f2aef7640ae467a986d69d1cc06a141b diff --git a/trunk/arch/arm/mach-omap2/board-n8x0.c b/trunk/arch/arm/mach-omap2/board-n8x0.c index 313ce5eb0d09..78636335cc7d 100644 --- a/trunk/arch/arm/mach-omap2/board-n8x0.c +++ b/trunk/arch/arm/mach-omap2/board-n8x0.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -633,6 +634,17 @@ static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = { }, }; +static struct aic3x_pdata n810_aic33_data __initdata = { + .gpio_reset = 118, +}; + +static struct i2c_board_info n810_i2c_board_info_2[] __initdata = { + { + I2C_BOARD_INFO("tlv320aic3x", 0x18), + .platform_data = &n810_aic33_data, + }, +}; + static void __init n8x0_map_io(void) { omap2_set_globals_242x(); @@ -662,6 +674,10 @@ static void __init n8x0_init_machine(void) 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_register_i2c_bus(2, 400, NULL, 0); + if (machine_is_nokia_n810()) + i2c_register_board_info(2, n810_i2c_board_info_2, + ARRAY_SIZE(n810_i2c_board_info_2)); omap_serial_init(); n8x0_onenand_init();