aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rx51-peripherals.c
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-12-20 21:48:16 -0500
committerTony Lindgren <tony@atomide.com>2010-12-20 21:48:16 -0500
commitcaeeb4aadfbff8d8efbb055594c0459cff94adad (patch)
tree2a6ca9d7bc136235e5ad2e9843c3011566af256a /arch/arm/mach-omap2/board-rx51-peripherals.c
parent91db7b2985555bd0456ad30440dd615c985fc9c6 (diff)
omap: rx51: Add supplies and data for codec b part ofTLV320AIC34
Upcoming ASoC core and tlv320aic3x changes makes possible to take b part of TLV320AIC34 into use on RX51/N900. Prepare to this by adding virtual supplies and platform data for b part of the codec. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 79ca3262dee6..7ea20813083d 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -343,6 +343,8 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
343 /* tlv320aic3x analog supplies */ 343 /* tlv320aic3x analog supplies */
344 REGULATOR_SUPPLY("AVDD", "2-0018"), 344 REGULATOR_SUPPLY("AVDD", "2-0018"),
345 REGULATOR_SUPPLY("DRVDD", "2-0018"), 345 REGULATOR_SUPPLY("DRVDD", "2-0018"),
346 REGULATOR_SUPPLY("AVDD", "2-0019"),
347 REGULATOR_SUPPLY("DRVDD", "2-0019"),
346 /* tpa6130a2 */ 348 /* tpa6130a2 */
347 REGULATOR_SUPPLY("Vdd", "2-0060"), 349 REGULATOR_SUPPLY("Vdd", "2-0060"),
348 /* Keep vmmc as last item. It is not iterated for newer boards */ 350 /* Keep vmmc as last item. It is not iterated for newer boards */
@@ -353,6 +355,8 @@ static struct regulator_consumer_supply rx51_vio_supplies[] = {
353 /* tlv320aic3x digital supplies */ 355 /* tlv320aic3x digital supplies */
354 REGULATOR_SUPPLY("IOVDD", "2-0018"), 356 REGULATOR_SUPPLY("IOVDD", "2-0018"),
355 REGULATOR_SUPPLY("DVDD", "2-0018"), 357 REGULATOR_SUPPLY("DVDD", "2-0018"),
358 REGULATOR_SUPPLY("IOVDD", "2-0019"),
359 REGULATOR_SUPPLY("DVDD", "2-0019"),
356}; 360};
357 361
358#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) 362#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
@@ -743,11 +747,19 @@ static struct aic3x_pdata rx51_aic3x_data = {
743 .gpio_reset = 60, 747 .gpio_reset = 60,
744}; 748};
745 749
750static struct aic3x_pdata rx51_aic3x_data2 = {
751 .gpio_reset = 60,
752};
753
746static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { 754static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
747 { 755 {
748 I2C_BOARD_INFO("tlv320aic3x", 0x18), 756 I2C_BOARD_INFO("tlv320aic3x", 0x18),
749 .platform_data = &rx51_aic3x_data, 757 .platform_data = &rx51_aic3x_data,
750 }, 758 },
759 {
760 I2C_BOARD_INFO("tlv320aic3x", 0x19),
761 .platform_data = &rx51_aic3x_data2,
762 },
751#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE) 763#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
752 { 764 {
753 I2C_BOARD_INFO("tsl2563", 0x29), 765 I2C_BOARD_INFO("tsl2563", 0x29),