ASoC: da7213: Add support for mono, set frame width to 32 when possible

This adds the DAI mono mode support and set the frame width to 32

Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com>
Tested-by: David Rau <David.Rau.opensource@dm.renesas.com>
Signed-off-by: David Rau <David.Rau.opensource@dm.renesas.com>
Link: https://lore.kernel.org/r/20221214044058.6289-1-David.Rau.opensource@dm.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 544ccbc..0068780 100644 (file)
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1157,13 +1157,31 @@ static int da7213_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_soc_component *component = dai->component;
        struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
+       u8 dai_clk_mode = DA7213_DAI_BCLKS_PER_WCLK_64;
        u8 dai_ctrl = 0;
        u8 fs;
 
+       /* Set channels */
+       switch (params_channels(params)) {
+       case 1:
+               if (da7213->fmt != DA7213_DAI_FORMAT_DSP) {
+                       dev_err(component->dev, "Mono supported only in DSP mode\n");
+                       return -EINVAL;
+               }
+               dai_ctrl |= DA7213_DAI_MONO_MODE_EN;
+               break;
+       case 2:
+               dai_ctrl &= ~(DA7213_DAI_MONO_MODE_EN);
+               break;
+       default:
+               return -EINVAL;
+       }
+
        /* Set DAI format */
        switch (params_width(params)) {
        case 16:
                dai_ctrl |= DA7213_DAI_WORD_LENGTH_S16_LE;
+               dai_clk_mode = DA7213_DAI_BCLKS_PER_WCLK_32; /* 32bit for 1ch and 2ch */
                break;
        case 20:
                dai_ctrl |= DA7213_DAI_WORD_LENGTH_S20_LE;
@@ -1224,8 +1242,11 @@ static int da7213_hw_params(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
-       snd_soc_component_update_bits(component, DA7213_DAI_CTRL, DA7213_DAI_WORD_LENGTH_MASK,
-                           dai_ctrl);
+       snd_soc_component_update_bits(component, DA7213_DAI_CLK_MODE,
+               DA7213_DAI_BCLKS_PER_WCLK_MASK, dai_clk_mode);
+
+       snd_soc_component_update_bits(component, DA7213_DAI_CTRL,
+               DA7213_DAI_WORD_LENGTH_MASK | DA7213_DAI_MONO_MODE_MASK, dai_ctrl);
        snd_soc_component_write(component, DA7213_SR, fs);
 
        return 0;
@@ -1300,19 +1321,24 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
                dai_ctrl |= DA7213_DAI_FORMAT_I2S_MODE;
+               da7213->fmt = DA7213_DAI_FORMAT_I2S_MODE;
                break;
        case SND_SOC_DAIFMT_LEFT_J:
                dai_ctrl |= DA7213_DAI_FORMAT_LEFT_J;
+               da7213->fmt = DA7213_DAI_FORMAT_LEFT_J;
                break;
        case SND_SOC_DAIFMT_RIGHT_J:
                dai_ctrl |= DA7213_DAI_FORMAT_RIGHT_J;
+               da7213->fmt = DA7213_DAI_FORMAT_RIGHT_J;
                break;
        case SND_SOC_DAI_FORMAT_DSP_A: /* L data MSB after FRM LRC */
                dai_ctrl |= DA7213_DAI_FORMAT_DSP;
                dai_offset = 1;
+               da7213->fmt = DA7213_DAI_FORMAT_DSP;
                break;
        case SND_SOC_DAI_FORMAT_DSP_B: /* L data MSB during FRM LRC */
                dai_ctrl |= DA7213_DAI_FORMAT_DSP;
+               da7213->fmt = DA7213_DAI_FORMAT_DSP;
                break;
        default:
                return -EINVAL;

diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h
index 97ccf0d..4ca9cfd 100644 (file)
--- a/sound/soc/codecs/da7213.h
+++ b/sound/soc/codecs/da7213.h
@@ -195,6 +195,8 @@
 #define DA7213_DAI_WORD_LENGTH_S24_LE                          (0x2 << 2)
 #define DA7213_DAI_WORD_LENGTH_S32_LE                          (0x3 << 2)
 #define DA7213_DAI_WORD_LENGTH_MASK                            (0x3 << 2)
+#define DA7213_DAI_MONO_MODE_EN                                        (0x1 << 4)
+#define DA7213_DAI_MONO_MODE_MASK                              (0x1 << 4)
 #define DA7213_DAI_EN_SHIFT                                    7
 
 /* DA7213_DIG_ROUTING_DAI = 0x21 */
@@ -542,6 +544,7 @@ struct da7213_priv {
        bool alc_en;
        bool fixed_clk_auto_pll;
        struct da7213_platform_data *pdata;
+       int fmt;
 };
 
 #endif /* _DA7213_H */