[PATCH v2 7/7] ASoC: pcm512x: Support SND_SOC_DAIFMT_CBM_CFS

[Peter Rosin]

From: Peter Rosin <p...@axentia.se>

Signed-off-by: Peter Rosin <p...@axentia.se>
---
 sound/soc/codecs/pcm512x.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index d46d6cdb6b87..64be85fb2748 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -464,6 +464,7 @@ static int pcm512x_dai_startup(struct snd_pcm_substream 
*substream,
 
        switch (pcm512x->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_CBM_CFS:
                return pcm512x_dai_startup_master(substream, dai);
 
        case SND_SOC_DAIFMT_CBS_CFS:
@@ -970,6 +971,8 @@ static int pcm512x_hw_params(struct snd_pcm_substream 
*substream,
        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
        int alen;
        int gpio;
+       int clock_output;
+       int master_mode;
        int ret;
 
        dev_dbg(codec->dev, "hw_params %u Hz, %u channels\n",
@@ -1018,6 +1021,12 @@ static int pcm512x_hw_params(struct snd_pcm_substream 
*substream,
                }
                return 0;
        case SND_SOC_DAIFMT_CBM_CFM:
+               clock_output = PCM512x_BCKO | PCM512x_LRKO;
+               master_mode = PCM512x_RLRK | PCM512x_RBCK;
+               break;
+       case SND_SOC_DAIFMT_CBM_CFS:
+               clock_output = PCM512x_BCKO;
+               master_mode = PCM512x_RBCK;
                break;
        default:
                return -EINVAL;
@@ -1114,7 +1123,7 @@ static int pcm512x_hw_params(struct snd_pcm_substream 
*substream,
 
        ret = regmap_update_bits(pcm512x->regmap, PCM512x_BCLK_LRCLK_CFG,
                                 PCM512x_BCKP | PCM512x_BCKO | PCM512x_LRKO,
-                                PCM512x_BCKO | PCM512x_LRKO);
+                                clock_output);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to enable clock output: %d\n", ret);
                return ret;
@@ -1122,7 +1131,7 @@ static int pcm512x_hw_params(struct snd_pcm_substream 
*substream,
 
        ret = regmap_update_bits(pcm512x->regmap, PCM512x_MASTER_MODE,
                                 PCM512x_RLRK | PCM512x_RBCK,
-                                PCM512x_RLRK | PCM512x_RBCK);
+                                master_mode);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to enable master mode: %d\n", ret);
                return ret;
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/