* [PATCH 1/2] ASoC: fsl_micfil: Expand the range of FIFO watermark mask
2024-07-25 8:54 [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9 Shengjiu Wang
@ 2024-07-25 8:54 ` Shengjiu Wang
2024-07-25 8:54 ` [PATCH 2/2] ASoC: fsl_micfil: Differentiate register access permission for platforms Shengjiu Wang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Shengjiu Wang @ 2024-07-25 8:54 UTC (permalink / raw)
To: shengjiu.wang, Xiubo.Lee, festevam, nicoleotsuka, lgirdwood,
broonie, perex, tiwai, alsa-devel, linuxppc-dev, linux-sound,
linux-kernel
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>
---
sound/soc/fsl/fsl_micfil.c | 2 +-
sound/soc/fsl/fsl_micfil.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
index 0d37edb70261..96a6b88d0d67 100644
--- 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 c6b902ba0a53..b7798a7cbf2a 100644
--- 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)
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/2] ASoC: fsl_micfil: Differentiate register access permission for platforms
2024-07-25 8:54 [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9 Shengjiu Wang
2024-07-25 8:54 ` [PATCH 1/2] ASoC: fsl_micfil: Expand the range of FIFO watermark mask Shengjiu Wang
@ 2024-07-25 8:54 ` Shengjiu Wang
2024-07-29 8:02 ` [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9 Iuliana Prodan
2024-07-31 13:53 ` Mark Brown
3 siblings, 0 replies; 5+ messages in thread
From: Shengjiu Wang @ 2024-07-25 8:54 UTC (permalink / raw)
To: shengjiu.wang, Xiubo.Lee, festevam, nicoleotsuka, lgirdwood,
broonie, perex, tiwai, alsa-devel, linuxppc-dev, linux-sound,
linux-kernel
On i.MX9x platforms, the REG_MICFIL_FSYNC_CTRL, REG_MICFIL_VERID,
REG_MICFIL_PARAM are added, but they are not existed on i.MX8x
platforms.
Use the existed micfil->soc->use_verid to distinguish the access
permission for these platforms.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
sound/soc/fsl/fsl_micfil.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
index 96a6b88d0d67..22b240a70ad4 100644
--- a/sound/soc/fsl/fsl_micfil.c
+++ b/sound/soc/fsl/fsl_micfil.c
@@ -855,6 +855,8 @@ static const struct reg_default fsl_micfil_reg_defaults[] = {
static bool fsl_micfil_readable_reg(struct device *dev, unsigned int reg)
{
+ struct fsl_micfil *micfil = dev_get_drvdata(dev);
+
switch (reg) {
case REG_MICFIL_CTRL1:
case REG_MICFIL_CTRL2:
@@ -872,9 +874,6 @@ static bool fsl_micfil_readable_reg(struct device *dev, unsigned int reg)
case REG_MICFIL_DC_CTRL:
case REG_MICFIL_OUT_CTRL:
case REG_MICFIL_OUT_STAT:
- case REG_MICFIL_FSYNC_CTRL:
- case REG_MICFIL_VERID:
- case REG_MICFIL_PARAM:
case REG_MICFIL_VAD0_CTRL1:
case REG_MICFIL_VAD0_CTRL2:
case REG_MICFIL_VAD0_STAT:
@@ -883,6 +882,12 @@ static bool fsl_micfil_readable_reg(struct device *dev, unsigned int reg)
case REG_MICFIL_VAD0_NDATA:
case REG_MICFIL_VAD0_ZCD:
return true;
+ case REG_MICFIL_FSYNC_CTRL:
+ case REG_MICFIL_VERID:
+ case REG_MICFIL_PARAM:
+ if (micfil->soc->use_verid)
+ return true;
+ fallthrough;
default:
return false;
}
@@ -890,6 +895,8 @@ static bool fsl_micfil_readable_reg(struct device *dev, unsigned int reg)
static bool fsl_micfil_writeable_reg(struct device *dev, unsigned int reg)
{
+ struct fsl_micfil *micfil = dev_get_drvdata(dev);
+
switch (reg) {
case REG_MICFIL_CTRL1:
case REG_MICFIL_CTRL2:
@@ -899,7 +906,6 @@ static bool fsl_micfil_writeable_reg(struct device *dev, unsigned int reg)
case REG_MICFIL_DC_CTRL:
case REG_MICFIL_OUT_CTRL:
case REG_MICFIL_OUT_STAT: /* Write 1 to Clear */
- case REG_MICFIL_FSYNC_CTRL:
case REG_MICFIL_VAD0_CTRL1:
case REG_MICFIL_VAD0_CTRL2:
case REG_MICFIL_VAD0_STAT: /* Write 1 to Clear */
@@ -907,6 +913,10 @@ static bool fsl_micfil_writeable_reg(struct device *dev, unsigned int reg)
case REG_MICFIL_VAD0_NCONFIG:
case REG_MICFIL_VAD0_ZCD:
return true;
+ case REG_MICFIL_FSYNC_CTRL:
+ if (micfil->soc->use_verid)
+ return true;
+ fallthrough;
default:
return false;
}
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9
2024-07-25 8:54 [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9 Shengjiu Wang
2024-07-25 8:54 ` [PATCH 1/2] ASoC: fsl_micfil: Expand the range of FIFO watermark mask Shengjiu Wang
2024-07-25 8:54 ` [PATCH 2/2] ASoC: fsl_micfil: Differentiate register access permission for platforms Shengjiu Wang
@ 2024-07-29 8:02 ` Iuliana Prodan
2024-07-31 13:53 ` Mark Brown
3 siblings, 0 replies; 5+ messages in thread
From: Iuliana Prodan @ 2024-07-29 8:02 UTC (permalink / raw)
To: Shengjiu Wang, shengjiu.wang, Xiubo.Lee, festevam, nicoleotsuka,
lgirdwood, broonie, perex, tiwai, alsa-devel, linuxppc-dev,
linux-sound, linux-kernel
On 7/25/2024 11:54 AM, Shengjiu Wang wrote:
> There are some register difference for i.MX8 and i.MX9
> REG_MICFIL_FIFO_CTRL definition is updated.
> REG_MICFIL_FSYNC_CTRL, REG_MICFIL_VERID, REG_MICFIL_PARAM are added from
> i.MX9
>
> Shengjiu Wang (2):
> ASoC: fsl_micfil: Expand the range of FIFO watermark mask
> ASoC: fsl_micfil: Differentiate register access permission for
> platforms
>
> sound/soc/fsl/fsl_micfil.c | 20 +++++++++++++++-----
> sound/soc/fsl/fsl_micfil.h | 2 +-
> 2 files changed, 16 insertions(+), 6 deletions(-)
For the series: Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Thanks, Iulia
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9
2024-07-25 8:54 [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9 Shengjiu Wang
` (2 preceding siblings ...)
2024-07-29 8:02 ` [PATCH 0/2] ASoC: fsl_micfil: Check the difference for i.MX8 and i.MX9 Iuliana Prodan
@ 2024-07-31 13:53 ` Mark Brown
3 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2024-07-31 13:53 UTC (permalink / raw)
To: shengjiu.wang, Xiubo.Lee, festevam, nicoleotsuka, lgirdwood,
perex, tiwai, alsa-devel, linuxppc-dev, linux-sound,
linux-kernel, Shengjiu Wang
On Thu, 25 Jul 2024 16:54:52 +0800, Shengjiu Wang wrote:
> There are some register difference for i.MX8 and i.MX9
> REG_MICFIL_FIFO_CTRL definition is updated.
> REG_MICFIL_FSYNC_CTRL, REG_MICFIL_VERID, REG_MICFIL_PARAM are added from
> i.MX9
>
> Shengjiu Wang (2):
> ASoC: fsl_micfil: Expand the range of FIFO watermark mask
> ASoC: fsl_micfil: Differentiate register access permission for
> platforms
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: fsl_micfil: Expand the range of FIFO watermark mask
commit: 4ddd51ccff911a2e9e961307692532a325f6c78a
[2/2] ASoC: fsl_micfil: Differentiate register access permission for platforms
commit: aa4f76ef09a993efa9b5fab6ddf5d6d324baaea3
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 5+ messages in thread