1 files changed, 10 insertions, 0 deletions

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index aba71bfa33b1..fdbb36aa9cf5 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -394,9 +394,14 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,
                              struct snd_soc_dai *cpu_dai)
 {
         struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai);
+        struct mxs_saif *master_saif;
         u32 scr, stat;
         int ret;
 
+        master_saif = mxs_saif_get_master(saif);
+        if (!master_saif)
+                return -EINVAL;
+
         /* mclk should already be set */
         if (!saif->mclk && saif->mclk_in_use) {
                 dev_err(cpu_dai->dev, "set mclk first\n");
@@ -420,6 +425,11 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,
                 return ret;
         }
 
+        /* prepare clk in hw_param, enable in trigger */
+        clk_prepare(saif->clk);
+        if (saif != master_saif)
+                clk_prepare(master_saif->clk);
+
         scr = __raw_readl(saif->base + SAIF_CTRL);
 
         scr &= ~BM_SAIF_CTRL_WORD_LENGTH;