summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-08-02 13:18:03 +0300
committerTony Lindgren <tony@atomide.com>2010-08-02 13:18:03 +0300
commit64d066918272db2a851e4884e38f264fd6b3c07b (patch)
tree1bccbc565703886c3ecc7b213aebf8870270d7fa
parent5c7d9bbec6415a00860e4ee482a794c940ba8733 (diff)
downloadlinux-3.10-64d066918272db2a851e4884e38f264fd6b3c07b.tar.gz
linux-3.10-64d066918272db2a851e4884e38f264fd6b3c07b.tar.bz2
linux-3.10-64d066918272db2a851e4884e38f264fd6b3c07b.zip
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>
-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 b4c3dd7863a..3c3f975520e 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -33,6 +33,7 @@
#include <plat/gpmc-smc91x.h>
#include <sound/tlv320aic3x.h>
+#include <sound/tpa6130a2-plat.h>
#include "mux.h"
#include "hsmmc.h"
@@ -314,6 +315,8 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
/* tlv320aic3x analog supplies */
REGULATOR_SUPPLY("AVDD", "2-0018"),
REGULATOR_SUPPLY("DRVDD", "2-0018"),
+ /* tpa6130a2 */
+ REGULATOR_SUPPLY("Vdd", "2-0060"),
/* Keep vmmc as last item. It is not iterated for newer boards */
REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
};
@@ -692,6 +695,11 @@ static struct aic3x_pdata rx51_aic3x_data __initdata = {
.gpio_reset = 60,
};
+static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
+ .id = TPA6130A2,
+ .power_gpio = 98,
+};
+
static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
{
I2C_BOARD_INFO("twl5030", 0x48),
@@ -706,6 +714,10 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
I2C_BOARD_INFO("tlv320aic3x", 0x18),
.platform_data = &rx51_aic3x_data,
},
+ {
+ I2C_BOARD_INFO("tpa6130a2", 0x60),
+ .platform_data = &rx51_tpa6130a2_data,
+ }
};
static int __init rx51_i2c_init(void)