summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Bhattacharya <sumitb@nvidia.com>2011-10-03 03:16:22 +0530
committerVarun Colbert <vcolbert@nvidia.com>2011-10-12 14:01:25 -0700
commit1d27af9304a1cc7e7834ad43dbbce56189de00b4 (patch)
tree9b800a489221bc0f5d4129272f51e8281734ac6d
parent498252e804e7d06b49d9e71f61fdcbace0f902ec (diff)
arm: tegra: Specify dev name for audio regulators
Specify device names for ventana and cardhu speaker and digital mic regulators. Also use same regulator name for ventana and cardhu speaker supply. Bug 872652 Change-Id: I5a254eee2037c86e208818f34cdff24aee0edad9 Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-on: http://git-master/r/55668 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-cardhu-power.c2
-rw-r--r--arch/arm/mach-tegra/board-ventana-power.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c
index 3a1f9e7d412f..7fefda92e374 100644
--- a/arch/arm/mach-tegra/board-cardhu-power.c
+++ b/arch/arm/mach-tegra/board-cardhu-power.c
@@ -494,7 +494,7 @@ static struct regulator_consumer_supply gpio_switch_en_3v3_sys_supply[] = {
REGULATOR_SUPPLY("vdd_3v3_edid", NULL),
REGULATOR_SUPPLY("vdd_3v3_hdmi_cec", NULL),
REGULATOR_SUPPLY("vdd_3v3_gmi", NULL),
- REGULATOR_SUPPLY("vdd_3v3_spk_amp", NULL),
+ REGULATOR_SUPPLY("vdd_spk_amp", "tegra-snd-wm8903"),
REGULATOR_SUPPLY("vdd_3v3_sensor", NULL),
REGULATOR_SUPPLY("vdd_3v3_cam", NULL),
REGULATOR_SUPPLY("vdd_3v3_als", NULL),
diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c
index 7f85b91cfb25..450d80c0a5a3 100644
--- a/arch/arm/mach-tegra/board-ventana-power.c
+++ b/arch/arm/mach-tegra/board-ventana-power.c
@@ -89,6 +89,7 @@ static struct regulator_consumer_supply tps658621_ldo5_supply[] = {
static struct regulator_consumer_supply tps658621_ldo6_supply[] = {
REGULATOR_SUPPLY("vdd_ldo6", NULL),
REGULATOR_SUPPLY("vcsi", "tegra_camera"),
+ REGULATOR_SUPPLY("vdd_dmic", "tegra-snd-wm8903"),
};
static struct regulator_consumer_supply tps658621_ldo7_supply[] = {
REGULATOR_SUPPLY("vdd_ldo7", NULL),
@@ -103,7 +104,7 @@ static struct regulator_consumer_supply tps658621_ldo9_supply[] = {
REGULATOR_SUPPLY("vdd_ldo9", NULL),
REGULATOR_SUPPLY("avdd_2v85", NULL),
REGULATOR_SUPPLY("vdd_ddr_rx", NULL),
- REGULATOR_SUPPLY("avdd_amp", NULL),
+ REGULATOR_SUPPLY("vdd_spk_amp", "tegra-snd-wm8903"),
};
static struct tps6586x_settings sm0_config = {