asoc: tegra: add e1853 board support
Songhee Baek [Mon, 13 Aug 2012 22:54:38 +0000 (15:54 -0700)]
Added config option for e1853 board

Bug 992422

Reviewed-on: http://git-master/r/123191
(cherry picked from commit 084598e15f7cae0bf191dc343d60f4f705415367)

Reviewed-on: http://git-master/r/123197
(cherry picked from commit 25fd36cd72e5d62c0c9d6b108c95220f6d7d34a5)

Change-Id: Ia46e67740daa0f47729d32ceffe37c16d4ab04d6
Signed-off-by: Songhee Baek <sbaek@nvidia.com>
Reviewed-on: http://git-master/r/207087
Tested-by: Nitin Nagaraja <nitinn@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bob Johnston <bjohnston@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>

sound/soc/tegra/Makefile
sound/soc/tegra/tegra_vcm.c

index 6442cf7..96bd445 100644 (file)
@@ -48,6 +48,7 @@ obj-$(CONFIG_SND_SOC_TEGRA_TLV320AIC326X) += snd-soc-tegra-aic326x.o
 obj-$(CONFIG_SND_SOC_TEGRA_RT5640) += snd-soc-tegra-rt5640.o
 obj-$(CONFIG_SND_SOC_TEGRA_MAX98095) += snd-soc-tegra-max98095.o
 obj-$(CONFIG_SND_SOC_TEGRA_P1852) += snd-soc-tegra-vcm.o
+obj-$(CONFIG_SND_SOC_TEGRA_E1853) += snd-soc-tegra-vcm.o
 obj-$(CONFIG_SND_SOC_TEGRA_P852) += snd-soc-tegra-vcm.o
 obj-$(CONFIG_SND_SOC_TEGRA_CS42L73) += snd-soc-tegra-cs42l73.o
 obj-$(CONFIG_SND_SOC_TEGRA_MAX98090) += snd-soc-tegra-max98090.o
index cf1224c..543c045 100644 (file)
@@ -131,6 +131,7 @@ static int tegra_vcm_hw_params(struct snd_pcm_substream *substream,
        default:
                break;
        }
+       i2s_daifmt |= SND_SOC_DAIFMT_NB_NF;
 
        err = snd_soc_dai_set_fmt(cpu_dai, i2s_daifmt);
        if (err < 0) {
@@ -138,9 +139,6 @@ static int tegra_vcm_hw_params(struct snd_pcm_substream *substream,
                return err;
        }
 
-       if (pdata->codec_info[codec_id].i2s_format == format_tdm)
-               i2s_daifmt |= SND_SOC_DAIFMT_NB_IF;
-
        err = snd_soc_dai_set_fmt(codec_dai, i2s_daifmt);
        if (err < 0)
                dev_info(card->dev, "codec_dai fmt not set\n");