diff options
| author | Andrew F. Davis <afd@ti.com> | 2017-11-29 15:32:53 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-01 13:31:09 +0000 |
| commit | 77f8b3cfc33cd4231cc2748bcac9f43b9eea546c (patch) | |
| tree | 74bb87b05a94c95ecf109e687e376cb5a91ffc0a /sound/soc | |
| parent | c6b8c779213dfe2a31e12400b1a2cf2a9a843236 (diff) | |
| download | op-kernel-dev-77f8b3cfc33cd4231cc2748bcac9f43b9eea546c.zip op-kernel-dev-77f8b3cfc33cd4231cc2748bcac9f43b9eea546c.tar.gz | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/tlv320aic31xx.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 05e6d19..d77cc36 100644 --- 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; } |
