asoc: tegra: ingnore dapm timeout for voice DAIs
Vijay Mali [Thu, 20 Mar 2014 06:00:29 +0000 (11:00 +0530)]
Bug 1476086

Change-Id: Ia368e64b59d601124b33abaa4b53aa7f6d321d44
Signed-off-by: Vijay Mali <vmali@nvidia.com>
Reviewed-on: http://git-master/r/385535
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Lei Fan <leif@nvidia.com>
Reviewed-by: Martin Chi <mchi@nvidia.com>

sound/soc/tegra/tegra_rt5640.c

index 9780b91..42c3df5 100644 (file)
@@ -543,7 +543,6 @@ static int tegra_bt_sco_hw_params(struct snd_pcm_substream *substream,
                        dev_err(card->dev, "Can't configure i2s format\n");
                        return -EINVAL;
        }
-
        err = snd_soc_dai_set_fmt(rtd->cpu_dai, i2s_daifmt);
        if (err < 0) {
                dev_err(card->dev, "cpu_dai fmt not set\n");
@@ -1108,7 +1107,6 @@ static void tegra_bt_voice_call_shutdown(struct snd_pcm_substream *substream)
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct tegra_rt5640 *machine  =
                        snd_soc_card_get_drvdata(rtd->codec->card);
-
 #ifndef CONFIG_ARCH_TEGRA_2x_SOC
        machine->codec_info[BT_SCO].rate = 0;
        machine->codec_info[BT_SCO].channels = 0;
@@ -1625,6 +1623,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai[NUM_DAI_LINKS] = {
                .codec_dai_name = "dit-hifi",
                .init = tegra_rt5640_init,
                .ops = &tegra_rt5640_bt_sco_ops,
+               .ignore_pmdown_time = 1,
        },
        [DAI_LINK_VOICE_CALL] = {
                .name = "VOICE CALL",
@@ -1644,6 +1643,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai[NUM_DAI_LINKS] = {
                .cpu_dai_name = "dit-hifi",
                .codec_dai_name = "dit-hifi",
                .ops = &tegra_bt_voice_call_ops,
+               .ignore_pmdown_time = 1,
        },
 };