aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-05-10 17:29:18 -0400
committerTony Lindgren <tony@atomide.com>2010-05-20 13:53:55 -0400
commitdabe929b590c0139aa5a18994d953a9eb201d626 (patch)
tree1ea6d2a39cdfec3965631c3d2023504b0d06a0ba /arch
parentf2add1de55d577b9babe4812a710affb903b366b (diff)
omap: rx51: Add i2c2 board_info with tlv320aic3x
This makes possible to probe the audio codec and add another i2c2 components in the future. Fix also indentation for the first omap_register_i2c_bus. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index b803f47792a4..3addfe646625 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -629,6 +629,12 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
629 }, 629 },
630}; 630};
631 631
632static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
633 {
634 I2C_BOARD_INFO("tlv320aic3x", 0x18),
635 },
636};
637
632static int __init rx51_i2c_init(void) 638static int __init rx51_i2c_init(void)
633{ 639{
634 if ((system_rev >= SYSTEM_REV_S_USES_VAUX3 && system_rev < 0x100) || 640 if ((system_rev >= SYSTEM_REV_S_USES_VAUX3 && system_rev < 0x100) ||
@@ -639,8 +645,9 @@ static int __init rx51_i2c_init(void)
639 rx51_twldata.vmmc2 = &rx51_vmmc2; 645 rx51_twldata.vmmc2 = &rx51_vmmc2;
640 } 646 }
641 omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1, 647 omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1,
642 ARRAY_SIZE(rx51_peripherals_i2c_board_info_1)); 648 ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
643 omap_register_i2c_bus(2, 100, NULL, 0); 649 omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,
650 ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));
644 omap_register_i2c_bus(3, 400, NULL, 0); 651 omap_register_i2c_bus(3, 400, NULL, 0);
645 return 0; 652 return 0;
646} 653}