ASoC: fsl_micfil: Expand the range of FIFO watermark mask

On the i.MX9x platforms, the mask of FIFO watermark
is 0x1F, on i.MX8x platforms, the mask of FIFO watermark
is 0X7. So use the mask 0x1F for all platforms to make them
compatible.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://patch.msgid.link/1721897694-6088-2-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
index 0d37edb..96a6b88 100644 (file)
--- a/sound/soc/fsl/fsl_micfil.c
+++ b/sound/soc/fsl/fsl_micfil.c
@@ -831,7 +831,7 @@ static const struct reg_default fsl_micfil_reg_defaults[] = {
        {REG_MICFIL_CTRL1,              0x00000000},
        {REG_MICFIL_CTRL2,              0x00000000},
        {REG_MICFIL_STAT,               0x00000000},
-       {REG_MICFIL_FIFO_CTRL,          0x00000007},
+       {REG_MICFIL_FIFO_CTRL,          0x0000001F},
        {REG_MICFIL_FIFO_STAT,          0x00000000},
        {REG_MICFIL_DATACH0,            0x00000000},
        {REG_MICFIL_DATACH1,            0x00000000},

diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h
index c6b902b..b7798a7 100644 (file)
--- a/sound/soc/fsl/fsl_micfil.h
+++ b/sound/soc/fsl/fsl_micfil.h
@@ -72,7 +72,7 @@
 #define MICFIL_STAT_CHXF(ch)           BIT(ch)
 
 /* MICFIL FIFO Control Register -- REG_MICFIL_FIFO_CTRL 0x10 */
-#define MICFIL_FIFO_CTRL_FIFOWMK       GENMASK(2, 0)
+#define MICFIL_FIFO_CTRL_FIFOWMK       GENMASK(4, 0)
 
 /* MICFIL FIFO Status Register -- REG_MICFIL_FIFO_STAT 0x14 */
 #define MICFIL_FIFO_STAT_FIFOX_OVER(ch)        BIT(ch)