Merge branch 'android-chromeos-dragon-3.18-nyc-mr1' into android-chromeos-dragon-3.18
Security February 2017.1
Change-Id: I91a231d87e83e4b4fd43cd6edee37bffdd30091f
diff --git a/sound/soc/tegra-alt/tegra_t210ref_mobile_rt5677_alt.c b/sound/soc/tegra-alt/tegra_t210ref_mobile_rt5677_alt.c
index 6f96897..1352ed1 100644
--- a/sound/soc/tegra-alt/tegra_t210ref_mobile_rt5677_alt.c
+++ b/sound/soc/tegra-alt/tegra_t210ref_mobile_rt5677_alt.c
@@ -459,8 +459,24 @@
machine->hotword_stream_active = false;
}
+static int tegra_rt5677_hotword_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ int err;
+ err = snd_soc_dai_set_pll(rtd->codec_dai, 0, RT5677_PLL1_S_MCLK,
+ RT5677_MCLK, RT5677_SYSCLK);
+ if (err < 0) {
+ dev_err(rtd->dev, "Failed dai_set_pll\n");
+ return err;
+ }
+
+ return 0;
+}
+
static struct snd_soc_ops tegra_rt5677_hotword_ops = {
.startup = tegra_rt5677_hotword_startup,
+ .hw_params = tegra_rt5677_hotword_hw_params,
.shutdown = tegra_rt5677_hotword_shutdown,
};
