diff options
| author | ScottPeterson <speterson@nvidia.com> | 2011-04-04 15:57:11 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-04-07 16:58:09 -0700 |
| commit | e9b228e7aa05a98624510213a5a89e642ed272f4 (patch) | |
| tree | fb00aae8b2d72ec5db5bf5489893955cba4e1184 /arch | |
| parent | 6fa92df36af66330bb1939b1ec8016df6e9b51b3 (diff) | |
ARM: tegra: audio: Enable external speaker amp
Enable the external speaker amp on Ventana.
Requires that the avdd_amp regulator be enabled.
Bug 809015
Change-Id: I0ec741655ed9629f8ad45adc43f5dfcba7369c60
Reviewed-on: http://git-master/r/26653
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Ching Kuang (Roger) Hsieh <rhsieh@nvidia.com>
Tested-by: Ching Kuang (Roger) Hsieh <rhsieh@nvidia.com>
Reviewed-by: Boris Suvorov <bsuvorov@nvidia.com>
Tested-by: Boris Suvorov <bsuvorov@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-jack.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/audio.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-jack.c b/arch/arm/mach-tegra/board-ventana-jack.c index 375b3970c26b..c01d77e4575b 100644 --- a/arch/arm/mach-tegra/board-ventana-jack.c +++ b/arch/arm/mach-tegra/board-ventana-jack.c @@ -22,6 +22,7 @@ #include <sound/jack.h> #include <sound/soc.h> #include <mach/gpio.h> +#include <linux/regulator/consumer.h> #include <mach/audio.h> #include "gpio-names.h" @@ -33,6 +34,7 @@ static struct tegra_wired_jack_conf ventana_wr_jack_conf = { .en_mic_int = TEGRA_GPIO_PX0, .en_spkr = WM8903_GP3, .cdc_irq = TEGRA_GPIO_PX3, + .spkr_amp_reg = "avdd_amp" }; static struct platform_device ventana_hs_jack_device = { diff --git a/arch/arm/mach-tegra/include/mach/audio.h b/arch/arm/mach-tegra/include/mach/audio.h index 05c849f7628a..4d7c58afb287 100644 --- a/arch/arm/mach-tegra/include/mach/audio.h +++ b/arch/arm/mach-tegra/include/mach/audio.h @@ -22,6 +22,7 @@ #include <linux/kernel.h> #include <linux/types.h> +#include <linux/regulator/consumer.h> #include <mach/i2s.h> #define FIFO1 0 @@ -64,6 +65,8 @@ struct tegra_wired_jack_conf { int en_mic_int; /* internal mic enable gpio pin */ int cdc_irq; /* mic jack detection pin(IRQ-mode or generic gpio) */ int en_spkr; /* gpio pin to drive amplifier */ + const char *spkr_amp_reg; /* regulator name for speaker amp */ + struct regulator *amp_reg; /* regulator for speaker amp */ }; #endif /* __ARCH_ARM_MACH_TEGRA_AUDIO_H */ |