Merge remote-tracking branches 'asoc/topic/wm8523' and 'asoc/topic/wm8741' into asoc...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / wm8523.c

diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 8c5b9df3e54204f5f6ee1c6159d1897999fd96c9..43ea8ae5f871d2ce4185c41b9a2c3384707c245e 100644 (file)
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -113,6 +113,15 @@ static struct {
        { 7, 1152 },
 };
 
+static struct {
+       int value;
+       int ratio;
+} bclk_ratios[WM8523_NUM_RATES] = {
+       { 2, 32 },
+       { 3, 64 },
+       { 4, 128 },
+};
+
 static int wm8523_startup(struct snd_pcm_substream *substream,
                          struct snd_soc_dai *dai)
 {
@@ -162,6 +171,23 @@ static int wm8523_hw_params(struct snd_pcm_substream *substream,
        aifctrl2 &= ~WM8523_SR_MASK;
        aifctrl2 |= lrclk_ratios[i].value;
 
+       if (aifctrl1 & WM8523_AIF_MSTR) {
+               /* Find a fs->bclk ratio */
+               for (i = 0; i < ARRAY_SIZE(bclk_ratios); i++)
+                       if (params_width(params) * 2 <= bclk_ratios[i].ratio)
+                               break;
+
+               if (i == ARRAY_SIZE(bclk_ratios)) {
+                       dev_err(codec->dev,
+                               "No matching BCLK/fs ratio for word length %d\n",
+                               params_width(params));
+                       return -EINVAL;
+               }
+
+               aifctrl2 &= ~WM8523_BCLKDIV_MASK;
+               aifctrl2 |= bclk_ratios[i].value << WM8523_BCLKDIV_SHIFT;
+       }
+
        aifctrl1 &= ~WM8523_WL_MASK;
        switch (params_width(params)) {
        case 16: