diff options
author | Jarkko Nikula <jhnikula@gmail.com> | 2010-08-02 06:18:03 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 06:18:03 -0400 |
commit | 64d066918272db2a851e4884e38f264fd6b3c07b (patch) | |
tree | 1bccbc565703886c3ecc7b213aebf8870270d7fa /arch/arm/mach-omap2/board-rx51-peripherals.c | |
parent | 5c7d9bbec6415a00860e4ee482a794c940ba8733 (diff) |
omap: rx51: Add supply and data for the tpa6130a2 headphoneamplifier
With these and upcoming change to tpa6130a2 driver it's possible to add
support for the TPA6130A2 headphone amplifier.
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.c | 12 |
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 b4c3dd7863ad..3c3f975520e8 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <plat/gpmc-smc91x.h> | 33 | #include <plat/gpmc-smc91x.h> |
34 | 34 | ||
35 | #include <sound/tlv320aic3x.h> | 35 | #include <sound/tlv320aic3x.h> |
36 | #include <sound/tpa6130a2-plat.h> | ||
36 | 37 | ||
37 | #include "mux.h" | 38 | #include "mux.h" |
38 | #include "hsmmc.h" | 39 | #include "hsmmc.h" |
@@ -314,6 +315,8 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = { | |||
314 | /* tlv320aic3x analog supplies */ | 315 | /* tlv320aic3x analog supplies */ |
315 | REGULATOR_SUPPLY("AVDD", "2-0018"), | 316 | REGULATOR_SUPPLY("AVDD", "2-0018"), |
316 | REGULATOR_SUPPLY("DRVDD", "2-0018"), | 317 | REGULATOR_SUPPLY("DRVDD", "2-0018"), |
318 | /* tpa6130a2 */ | ||
319 | REGULATOR_SUPPLY("Vdd", "2-0060"), | ||
317 | /* Keep vmmc as last item. It is not iterated for newer boards */ | 320 | /* Keep vmmc as last item. It is not iterated for newer boards */ |
318 | REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"), | 321 | REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"), |
319 | }; | 322 | }; |
@@ -692,6 +695,11 @@ static struct aic3x_pdata rx51_aic3x_data __initdata = { | |||
692 | .gpio_reset = 60, | 695 | .gpio_reset = 60, |
693 | }; | 696 | }; |
694 | 697 | ||
698 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { | ||
699 | .id = TPA6130A2, | ||
700 | .power_gpio = 98, | ||
701 | }; | ||
702 | |||
695 | static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = { | 703 | static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = { |
696 | { | 704 | { |
697 | I2C_BOARD_INFO("twl5030", 0x48), | 705 | I2C_BOARD_INFO("twl5030", 0x48), |
@@ -706,6 +714,10 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { | |||
706 | I2C_BOARD_INFO("tlv320aic3x", 0x18), | 714 | I2C_BOARD_INFO("tlv320aic3x", 0x18), |
707 | .platform_data = &rx51_aic3x_data, | 715 | .platform_data = &rx51_aic3x_data, |
708 | }, | 716 | }, |
717 | { | ||
718 | I2C_BOARD_INFO("tpa6130a2", 0x60), | ||
719 | .platform_data = &rx51_tpa6130a2_data, | ||
720 | } | ||
709 | }; | 721 | }; |
710 | 722 | ||
711 | static int __init rx51_i2c_init(void) | 723 | static int __init rx51_i2c_init(void) |