diff options
| author | Ravindra Lokhande <rlokhande@nvidia.com> | 2011-07-18 17:33:08 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-19 16:29:37 -0700 |
| commit | 9bb999ef07976cabc67381ae26fbb211cce81819 (patch) | |
| tree | cb7cd59d5d2c10ef59d182a352048feb5fc02602 /sound | |
| parent | d9ab5c234ea02ff50ddd5c2666392792628ab1bb (diff) | |
sound: soc: tegra: correct asoc pin connection
corrected pin connection. Removed unused pins. Added missing sample
rates for i2s.
Change-Id: Ib12e9f5ee65c77b091e1d38107a83218c52f87d5
Reviewed-on: http://git-master/r/41550
Tested-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_i2s.c | 4 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_soc_max98088.c | 48 |
2 files changed, 5 insertions, 47 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c index e909359fbdc0..93d84ba39337 100644 --- a/sound/soc/tegra/tegra_i2s.c +++ b/sound/soc/tegra/tegra_i2s.c @@ -163,9 +163,13 @@ static int tegra_i2s_hw_params(struct snd_pcm_substream *substream, switch (params_rate(params)) { case 8000: + case 11025: + case 16000: + case 22050: case 32000: case 44100: case 48000: + case 64000: case 88200: case 96000: val = params_rate(params); diff --git a/sound/soc/tegra/tegra_soc_max98088.c b/sound/soc/tegra/tegra_soc_max98088.c index 03b1f466359b..1243c7dc6407 100644 --- a/sound/soc/tegra/tegra_soc_max98088.c +++ b/sound/soc/tegra/tegra_soc_max98088.c @@ -241,12 +241,7 @@ void tegra_ext_control(struct snd_soc_codec *codec, int new_con) else snd_soc_dapm_disable_pin(codec, "Headphone"); - if (new_con & (TEGRA_LINEOUT | TEGRA_EAR_SPK)) - snd_soc_dapm_enable_pin(codec, "Lineout"); - else - snd_soc_dapm_disable_pin(codec, "Lineout"); - - if (new_con & TEGRA_SPK) + if (new_con & (TEGRA_SPK | TEGRA_EAR_SPK)) snd_soc_dapm_enable_pin(codec, "Int Spk"); else snd_soc_dapm_disable_pin(codec, "Int Spk"); @@ -361,52 +356,11 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Int Spk", NULL, "SPKL"}, {"Int Spk", NULL, "SPKR"}, - /* Receiver connected to RECL and RECR */ - {"Lineout", NULL, "RECL"}, - {"Lineout", NULL, "RECR"}, - /* * To be complete, add remained in/out devices such as built-in mic * and headset mic. */ }; -#if 0 -/* Tegra machine audio map (connections to the codec pins) */ -static const struct snd_soc_dapm_route audio_map[] = { - - /* headphone connected to LHPOUT1, RHPOUT1 */ - {"Headphone", NULL, "HPOUTR"}, - {"Headphone", NULL, "HPOUTL"}, - - /* headset Jack - in = micin, out = HPOUT*/ - {"Headset", NULL, "HPOUTR"}, - {"Headset", NULL, "HPOUTL"}, - {"IN1L", NULL, "Headset"}, - {"IN1R", NULL, "Headset"}, - - /* lineout connected to LINEOUTR and LINEOUTL */ - {"Lineout", NULL, "LINEOUTR"}, - {"Lineout", NULL, "LINEOUTL"}, - - /* build-in speaker connected to LON/P RON/P */ - {"Int Spk", NULL, "RON"}, - {"Int Spk", NULL, "ROP"}, - {"Int Spk", NULL, "LON"}, - {"Int Spk", NULL, "LOP"}, - - /* internal mic is mono */ - {"IN1R", NULL, "Int Mic"}, - - /* external mic is stero */ - {"IN1L", NULL, "Ext Mic"}, - {"IN1R", NULL, "Ext Mic"}, - - /* Line In */ - {"IN3L", NULL, "Linein"}, - {"IN3R", NULL, "Linein"}, -}; -#endif - static int tegra_codec_init(struct snd_soc_codec *codec) { |