aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-n8x0.c
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-08-20 02:36:28 -0400
committerTony Lindgren <tony@atomide.com>2010-09-23 21:27:47 -0400
commit366498d4f2aef7640ae467a986d69d1cc06a141b (patch)
treefec94e008c101fdcb74a28f8f1199ed36c03f414 /arch/arm/mach-omap2/board-n8x0.c
parenta7f97d25c707e1020bd7bcb443e183860e5abf48 (diff)
omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810
Second i2c bus on Nokia N800 and N810 shares both common and hw specific peripherals. Register now this bus and add board info with tlv320aic3x for N810. Common peripherals may be added as an additional board info to omap_register_i2c_bus(2, ...); Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-n8x0.c')
-rw-r--r--arch/arm/mach-omap2/board-n8x0.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 313ce5eb0d0..78636335cc7 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -20,6 +20,7 @@
20#include <linux/i2c.h> 20#include <linux/i2c.h>
21#include <linux/spi/spi.h> 21#include <linux/spi/spi.h>
22#include <linux/usb/musb.h> 22#include <linux/usb/musb.h>
23#include <sound/tlv320aic3x.h>
23 24
24#include <asm/mach/arch.h> 25#include <asm/mach/arch.h>
25#include <asm/mach-types.h> 26#include <asm/mach-types.h>
@@ -633,6 +634,17 @@ static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {
633 }, 634 },
634}; 635};
635 636
637static struct aic3x_pdata n810_aic33_data __initdata = {
638 .gpio_reset = 118,
639};
640
641static struct i2c_board_info n810_i2c_board_info_2[] __initdata = {
642 {
643 I2C_BOARD_INFO("tlv320aic3x", 0x18),
644 .platform_data = &n810_aic33_data,
645 },
646};
647
636static void __init n8x0_map_io(void) 648static void __init n8x0_map_io(void)
637{ 649{
638 omap2_set_globals_242x(); 650 omap2_set_globals_242x();
@@ -662,6 +674,10 @@ static void __init n8x0_init_machine(void)
662 ARRAY_SIZE(n800_spi_board_info)); 674 ARRAY_SIZE(n800_spi_board_info));
663 omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1, 675 omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1,
664 ARRAY_SIZE(n8x0_i2c_board_info_1)); 676 ARRAY_SIZE(n8x0_i2c_board_info_1));
677 omap_register_i2c_bus(2, 400, NULL, 0);
678 if (machine_is_nokia_n810())
679 i2c_register_board_info(2, n810_i2c_board_info_2,
680 ARRAY_SIZE(n810_i2c_board_info_2));
665 681
666 omap_serial_init(); 682 omap_serial_init();
667 n8x0_onenand_init(); 683 n8x0_onenand_init();