ASoC: max98927: Added support for DSP_A and DSP_B format

Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 24 insertions, 17 deletions

diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index d9dbbe72f8ad..6f7b3ef48e25 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -1,7 +1,7 @@
 /*
  * max98927.c  --  MAX98927 ALSA Soc Audio driver
  *
- * Copyright (C) 2016 Maxim Integrated Products
+ * Copyright (C) 2016-2017 Maxim Integrated Products
  * Author: Ryan Lee <ryans.lee@maximintegrated.com>
  *
  *  This program is free software; you can redistribute  it and/or modify it
@@ -146,6 +146,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec);
         unsigned int mode = 0;
         unsigned int format = 0;
+        bool use_pdm = false;
         unsigned int invert = 0;
 
         dev_dbg(codec->dev, "%s: fmt 0x%08X\n", __func__, fmt);
@@ -187,22 +188,27 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         /* interface format */
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_I2S:
-                max98927->iface |= SND_SOC_DAIFMT_I2S;
                 format = MAX98927_PCM_FORMAT_I2S;
                 break;
         case SND_SOC_DAIFMT_LEFT_J:
-                max98927->iface |= SND_SOC_DAIFMT_LEFT_J;
                 format = MAX98927_PCM_FORMAT_LJ;
                 break;
+        case SND_SOC_DAIFMT_DSP_A:
+                format = MAX98927_PCM_FORMAT_TDM_MODE1;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                format = MAX98927_PCM_FORMAT_TDM_MODE0;
+                break;
         case SND_SOC_DAIFMT_PDM:
-                max98927->iface |= SND_SOC_DAIFMT_PDM;
+                use_pdm = true;
                 break;
         default:
                 return -EINVAL;
         }
+        max98927->iface = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
 
-        /* pcm channel configuration */
-        if (max98927->iface & (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_LEFT_J)) {
+        if (!use_pdm) {
+                /* pcm channel configuration */
                 regmap_update_bits(max98927->regmap,
                         MAX98927_R0018_PCM_RX_EN_A,
                         MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN,
@@ -217,13 +223,11 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
                         MAX98927_R003B_SPK_SRC_SEL,
                         MAX98927_SPK_SRC_MASK, 0);
 
-        } else
                 regmap_update_bits(max98927->regmap,
-                        MAX98927_R0018_PCM_RX_EN_A,
-                        MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, 0);
-
-        /* pdm channel configuration */
-        if (max98927->iface & SND_SOC_DAIFMT_PDM) {
+                        MAX98927_R0035_PDM_RX_CTRL,
+                        MAX98927_PDM_RX_EN_MASK, 0);
+        } else {
+                /* pdm channel configuration */
                 regmap_update_bits(max98927->regmap,
                         MAX98927_R0035_PDM_RX_CTRL,
                         MAX98927_PDM_RX_EN_MASK, 1);
@@ -231,10 +235,11 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
                 regmap_update_bits(max98927->regmap,
                         MAX98927_R003B_SPK_SRC_SEL,
                         MAX98927_SPK_SRC_MASK, 3);
-        } else
+
                 regmap_update_bits(max98927->regmap,
-                        MAX98927_R0035_PDM_RX_CTRL,
-                        MAX98927_PDM_RX_EN_MASK, 0);
+                        MAX98927_R0018_PCM_RX_EN_A,
+                        MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, 0);
+        }
         return 0;
 }
 
diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h
index ece6a608cbe1..bf7a6f92562a 100644
--- a/sound/soc/codecs/max98927.h
+++ b/sound/soc/codecs/max98927.h
@@ -1,7 +1,7 @@
 /*
  * max98927.h  --  MAX98927 ALSA Soc Audio driver
  *
- * Copyright 2013-15 Maxim Integrated Products
+ * Copyright (C) 2016-2017 Maxim Integrated Products
  * Author: Ryan Lee <ryans.lee@maximintegrated.com>
  *
  *  This program is free software; you can redistribute  it and/or modify it
@@ -161,7 +161,9 @@
 #define MAX98927_PCM_MODE_CFG_FORMAT_SHIFT (3)
 #define MAX98927_PCM_FORMAT_I2S (0x0 << 0)
 #define MAX98927_PCM_FORMAT_LJ (0x1 << 0)
-
+#define MAX98927_PCM_FORMAT_TDM_MODE0 (0x3 << 0)
+#define MAX98927_PCM_FORMAT_TDM_MODE1 (0x4 << 0)
+#define MAX98927_PCM_FORMAT_TDM_MODE2 (0x5 << 0)
 #define MAX98927_PCM_MODE_CFG_CHANSZ_MASK (0x3 << 6)
 #define MAX98927_PCM_MODE_CFG_CHANSZ_16 (0x1 << 6)
 #define MAX98927_PCM_MODE_CFG_CHANSZ_24 (0x2 << 6)