diff options
| author | Manoj Gangwal <mgangwal@nvidia.com> | 2012-11-22 12:23:39 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-11-29 16:26:12 -0800 |
| commit | 8e79a78afa23e6fbbdc5b0e556fd898bd69e18cb (patch) | |
| tree | 1133009c031f36c49c68ac45191bc47e86e3a2c8 /sound | |
| parent | dfa84fe5971cac8381c51e0b64b96cc4c43d25f1 (diff) | |
asoc: aic326x machine: Add support for TI codec
Add support for TI K3.4 aic326x codec driver.
Bug 1179798
Change-Id: Id098932d3bb4ecf25643f7a49e42b8f901af1d0d
Signed-off-by: Manoj Gangwal <mgangwal@nvidia.com>
Reviewed-on: http://git-master/r/165623
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijay Mali <vmali@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_aic326x.c | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/sound/soc/tegra/tegra_aic326x.c b/sound/soc/tegra/tegra_aic326x.c index 568db228e8ca..6913b3707cb6 100644 --- a/sound/soc/tegra/tegra_aic326x.c +++ b/sound/soc/tegra/tegra_aic326x.c @@ -39,7 +39,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/mfd/tlv320aic3262-registers.h> - +#include <linux/mfd/tlv320aic3xxx-core.h> #include "../codecs/tlv320aic326x.h" #include "tegra_pcm.h" @@ -343,12 +343,6 @@ static int tegra_aic326x_hw_params(struct snd_pcm_substream *substream, return err; } - err = snd_soc_dai_set_sysclk(codec_dai, 0, rate, SND_SOC_CLOCK_IN); - if (err < 0) { - dev_err(card->dev, "codec_dai clock not set\n"); - return err; - } - err = snd_soc_dai_set_pll(codec_dai, 0, AIC3262_PLL_CLKIN_MCLK1 , rate, params_rate(params)); @@ -731,11 +725,6 @@ static int tegra_aic326x_voice_call_hw_params( return err; } - err = snd_soc_dai_set_sysclk(codec_dai, 0, rate, SND_SOC_CLOCK_IN); - if (err < 0) { - dev_err(card->dev, "codec_dai clock not set\n"); - return err; - } err = snd_soc_dai_set_pll(codec_dai, 0, AIC3262_PLL_CLKIN_MCLK1 , rate, params_rate(params)); @@ -973,26 +962,23 @@ static const struct snd_soc_dapm_widget tegra_aic326x_dapm_widgets[] = { }; static const struct snd_soc_dapm_route aic326x_audio_map[] = { - {"Int Spk", NULL, "SPKL"}, - {"Int Spk", NULL, "SPKR"}, - {"Earpiece", NULL, "RECP"}, - {"Earpiece", NULL, "RECM"}, - {"Headphone Jack", NULL, "HPL"}, - {"Headphone Jack", NULL, "HPR"}, + {"Int Spk", NULL, "SPK Left Playback"}, + {"Int Spk", NULL, "SPK Right Playback"}, + {"Earpiece", NULL, "RECP Playback"}, + {"Earpiece", NULL, "RECM Playback"}, + {"Headphone Jack", NULL, "HP Left Playback"}, + {"Headphone Jack", NULL, "HP Right Playback"}, /* internal (IN2L/IN2R) mic is stero */ {"Mic Bias Int" ,NULL, "Int Mic"}, - {"IN2L", NULL, "Mic Bias Int"}, + {"IN2 Left Capture", NULL, "Mic Bias Int"}, {"Mic Bias Int" ,NULL, "Int Mic"}, - {"IN2R", NULL, "Mic Bias Int"}, - {"IN1L", NULL, "Mic Bias Ext"}, - {"Mic Bias Ext" ,NULL, "Mic Jack"}, + {"IN2 Right Capture", NULL, "Mic Bias Int"}, + {"IN1 Left Capture", NULL, "Mic Bias Ext"}, + {"Mic Bias Ext" , NULL, "Mic Jack"}, /* Connect LDMIC and RDMIC to DMIC widget*/ - {"Left DMIC", NULL, "Mic Bias Int"}, - {"Right DMIC", NULL, "Mic Bias Int"}, + {"Left DMIC Capture", NULL, "Mic Bias Int"}, + {"Right DMIC Capture", NULL, "Mic Bias Int"}, {"Mic Bias Int", NULL, "Int Mic"}, -/* {"CM1L" ,NULL, "Mic Jack"}, */ -/* {"IN1L", NULL, "Mic Bias Ext"}, */ -/* {"IN1L", NULL, "CM1L"}, */ }; static const struct snd_kcontrol_new tegra_aic326x_controls[] = { |