ASoC: tlv320aic31xx: Add CODEC clock slave support

This CODEC supports being the WCLK and/or BCLK slave, add
support for this here.

Also make the alert into an error as alert is more urgent
than needed here and is rarely used.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 05e6d194d6a9bad216489444ee3d2ab9abf940ff..d77cc36d7360e76e668d29121240de24ab860ba0 100644 (file)
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -925,8 +925,16 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai,
        case SND_SOC_DAIFMT_CBM_CFM:
                iface_reg1 |= AIC31XX_BCLK_MASTER | AIC31XX_WCLK_MASTER;
                break;
+       case SND_SOC_DAIFMT_CBS_CFM:
+               iface_reg1 |= AIC31XX_WCLK_MASTER;
+               break;
+       case SND_SOC_DAIFMT_CBM_CFS:
+               iface_reg1 |= AIC31XX_BCLK_MASTER;
+               break;
+       case SND_SOC_DAIFMT_CBS_CFS:
+               break;
        default:
-               dev_alert(codec->dev, "Invalid DAI master/slave interface\n");
+               dev_err(codec->dev, "Invalid DAI master/slave interface\n");
                return -EINVAL;
        }