* [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP
@ 2022-05-16 8:06 Shengjiu Wang
2022-05-16 8:06 ` [PATCH 1/3] ASoC: fsl_sai: Add support for i.MX8MM Shengjiu Wang
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Shengjiu Wang @ 2022-05-16 8:06 UTC (permalink / raw)
To: nicoleotsuka, Xiubo.Lee, festevam, shengjiu.wang, lgirdwood,
broonie, perex, tiwai, alsa-devel
Cc: linuxppc-dev, linux-kernel
ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP platforms
Shengjiu Wang (3):
ASoC: fsl_sai: Add support for i.MX8MM
ASoC: fsl_sai: Add support for i.MX8M Plus
ASoC: fsl_sai: Add support for i.MX8ULP
sound/soc/fsl/fsl_sai.c | 43 ++++++++++++++++++++++++++++++++++++++++-
sound/soc/fsl/fsl_sai.h | 1 +
2 files changed, 43 insertions(+), 1 deletion(-)
--
2.17.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] ASoC: fsl_sai: Add support for i.MX8MM
2022-05-16 8:06 [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Shengjiu Wang
@ 2022-05-16 8:06 ` Shengjiu Wang
2022-05-16 8:06 ` [PATCH 2/3] ASoC: fsl_sai: Add support for i.MX8M Plus Shengjiu Wang
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Shengjiu Wang @ 2022-05-16 8:06 UTC (permalink / raw)
To: nicoleotsuka, Xiubo.Lee, festevam, shengjiu.wang, lgirdwood,
broonie, perex, tiwai, alsa-devel
Cc: linuxppc-dev, linux-kernel
On i.MX8MM the max register is FSL_SAI_MCTL, which is
different with previous platform, so add max_register in
soc data to distinguish platforms.
And add specific soc data for i.MX8MM
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
sound/soc/fsl/fsl_sai.c | 17 +++++++++++++++++
sound/soc/fsl/fsl_sai.h | 1 +
2 files changed, 18 insertions(+)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index ffc24afb5a7a..1ac65de094b9 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1203,6 +1203,7 @@ static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
.reg_offset = 0,
.mclk0_is_mclk1 = false,
.flags = 0,
+ .max_register = FSL_SAI_RMR,
};
static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = {
@@ -1213,6 +1214,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = {
.reg_offset = 0,
.mclk0_is_mclk1 = true,
.flags = 0,
+ .max_register = FSL_SAI_RMR,
};
static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = {
@@ -1223,6 +1225,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = {
.reg_offset = 8,
.mclk0_is_mclk1 = false,
.flags = PMQOS_CPU_LATENCY,
+ .max_register = FSL_SAI_RMR,
};
static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = {
@@ -1233,6 +1236,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = {
.reg_offset = 8,
.mclk0_is_mclk1 = false,
.flags = 0,
+ .max_register = FSL_SAI_RMR,
};
static const struct fsl_sai_soc_data fsl_sai_imx8qm_data = {
@@ -1243,6 +1247,18 @@ static const struct fsl_sai_soc_data fsl_sai_imx8qm_data = {
.reg_offset = 0,
.mclk0_is_mclk1 = false,
.flags = 0,
+ .max_register = FSL_SAI_RMR,
+};
+
+static const struct fsl_sai_soc_data fsl_sai_imx8mm_data = {
+ .use_imx_pcm = true,
+ .use_edma = false,
+ .fifo_depth = 128,
+ .reg_offset = 8,
+ .mclk0_is_mclk1 = false,
+ .pins = 8,
+ .flags = 0,
+ .max_register = FSL_SAI_MCTL,
};
static const struct of_device_id fsl_sai_ids[] = {
@@ -1252,6 +1268,7 @@ static const struct of_device_id fsl_sai_ids[] = {
{ .compatible = "fsl,imx7ulp-sai", .data = &fsl_sai_imx7ulp_data },
{ .compatible = "fsl,imx8mq-sai", .data = &fsl_sai_imx8mq_data },
{ .compatible = "fsl,imx8qm-sai", .data = &fsl_sai_imx8qm_data },
+ { .compatible = "fsl,imx8mm-sai", .data = &fsl_sai_imx8mm_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, fsl_sai_ids);
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index 7310fd02cc3c..e4965efe6102 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -223,6 +223,7 @@ struct fsl_sai_soc_data {
unsigned int pins;
unsigned int reg_offset;
unsigned int flags;
+ unsigned int max_register;
};
/**
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] ASoC: fsl_sai: Add support for i.MX8M Plus
2022-05-16 8:06 [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Shengjiu Wang
2022-05-16 8:06 ` [PATCH 1/3] ASoC: fsl_sai: Add support for i.MX8MM Shengjiu Wang
@ 2022-05-16 8:06 ` Shengjiu Wang
2022-05-16 8:06 ` [PATCH 3/3] ASoC: fsl_sai: Add support for i.MX8ULP Shengjiu Wang
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Shengjiu Wang @ 2022-05-16 8:06 UTC (permalink / raw)
To: nicoleotsuka, Xiubo.Lee, festevam, shengjiu.wang, lgirdwood,
broonie, perex, tiwai, alsa-devel
Cc: linuxppc-dev, linux-kernel
Add i.MX8M Plus specific soc data, the max register is FSL_SAI_MDIV.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
sound/soc/fsl/fsl_sai.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 1ac65de094b9..b528722acd65 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1261,6 +1261,17 @@ static const struct fsl_sai_soc_data fsl_sai_imx8mm_data = {
.max_register = FSL_SAI_MCTL,
};
+static const struct fsl_sai_soc_data fsl_sai_imx8mp_data = {
+ .use_imx_pcm = true,
+ .use_edma = false,
+ .fifo_depth = 128,
+ .reg_offset = 8,
+ .mclk0_is_mclk1 = false,
+ .pins = 8,
+ .flags = 0,
+ .max_register = FSL_SAI_MDIV,
+};
+
static const struct of_device_id fsl_sai_ids[] = {
{ .compatible = "fsl,vf610-sai", .data = &fsl_sai_vf610_data },
{ .compatible = "fsl,imx6sx-sai", .data = &fsl_sai_imx6sx_data },
@@ -1269,6 +1280,7 @@ static const struct of_device_id fsl_sai_ids[] = {
{ .compatible = "fsl,imx8mq-sai", .data = &fsl_sai_imx8mq_data },
{ .compatible = "fsl,imx8qm-sai", .data = &fsl_sai_imx8qm_data },
{ .compatible = "fsl,imx8mm-sai", .data = &fsl_sai_imx8mm_data },
+ { .compatible = "fsl,imx8mp-sai", .data = &fsl_sai_imx8mp_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, fsl_sai_ids);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] ASoC: fsl_sai: Add support for i.MX8ULP
2022-05-16 8:06 [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Shengjiu Wang
2022-05-16 8:06 ` [PATCH 1/3] ASoC: fsl_sai: Add support for i.MX8MM Shengjiu Wang
2022-05-16 8:06 ` [PATCH 2/3] ASoC: fsl_sai: Add support for i.MX8M Plus Shengjiu Wang
@ 2022-05-16 8:06 ` Shengjiu Wang
2022-05-16 11:18 ` Fabio Estevam
2022-05-17 15:59 ` Mark Brown
4 siblings, 0 replies; 8+ messages in thread
From: Shengjiu Wang @ 2022-05-16 8:06 UTC (permalink / raw)
To: nicoleotsuka, Xiubo.Lee, festevam, shengjiu.wang, lgirdwood,
broonie, perex, tiwai, alsa-devel
Cc: linuxppc-dev, linux-kernel
Add i.MX8ULP specific soc data, the max register is FSL_SAI_RTCAP
the IP version is also 0x0301, So version can't be used for the
condition of register FSL_SAI_MCTL setting.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
sound/soc/fsl/fsl_sai.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index b528722acd65..fa950dde5310 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1147,7 +1147,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
/* Select MCLK direction */
if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
- sai->verid.version >= 0x0301) {
+ sai->soc_data->max_register >= FSL_SAI_MCTL) {
regmap_update_bits(sai->regmap, FSL_SAI_MCTL,
FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN);
}
@@ -1272,6 +1272,17 @@ static const struct fsl_sai_soc_data fsl_sai_imx8mp_data = {
.max_register = FSL_SAI_MDIV,
};
+static const struct fsl_sai_soc_data fsl_sai_imx8ulp_data = {
+ .use_imx_pcm = true,
+ .use_edma = true,
+ .fifo_depth = 16,
+ .reg_offset = 8,
+ .mclk0_is_mclk1 = false,
+ .pins = 4,
+ .flags = PMQOS_CPU_LATENCY,
+ .max_register = FSL_SAI_RTCAP,
+};
+
static const struct of_device_id fsl_sai_ids[] = {
{ .compatible = "fsl,vf610-sai", .data = &fsl_sai_vf610_data },
{ .compatible = "fsl,imx6sx-sai", .data = &fsl_sai_imx6sx_data },
@@ -1281,6 +1292,7 @@ static const struct of_device_id fsl_sai_ids[] = {
{ .compatible = "fsl,imx8qm-sai", .data = &fsl_sai_imx8qm_data },
{ .compatible = "fsl,imx8mm-sai", .data = &fsl_sai_imx8mm_data },
{ .compatible = "fsl,imx8mp-sai", .data = &fsl_sai_imx8mp_data },
+ { .compatible = "fsl,imx8ulp-sai", .data = &fsl_sai_imx8ulp_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, fsl_sai_ids);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP
2022-05-16 8:06 [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Shengjiu Wang
2022-05-16 8:06 ` [PATCH 1/3] ASoC: fsl_sai: Add support for i.MX8MM Shengjiu Wang
@ 2022-05-16 11:18 ` Fabio Estevam
2022-05-16 8:06 ` [PATCH 3/3] ASoC: fsl_sai: Add support for i.MX8ULP Shengjiu Wang
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2022-05-16 11:18 UTC (permalink / raw)
To: Shengjiu Wang
Cc: Nicolin Chen, Xiubo Li, Shengjiu Wang, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Linux-ALSA, linuxppc-dev,
linux-kernel
Hi Shengjiu,
On Mon, May 16, 2022 at 5:18 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
>
> ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP platforms
>
> Shengjiu Wang (3):
> ASoC: fsl_sai: Add support for i.MX8MM
> ASoC: fsl_sai: Add support for i.MX8M Plus
> ASoC: fsl_sai: Add support for i.MX8ULP
For the series:
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP
@ 2022-05-16 11:18 ` Fabio Estevam
0 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2022-05-16 11:18 UTC (permalink / raw)
To: Shengjiu Wang
Cc: Linux-ALSA, Xiubo Li, linuxppc-dev, Takashi Iwai, Liam Girdwood,
Jaroslav Kysela, Nicolin Chen, Mark Brown, Shengjiu Wang,
linux-kernel
Hi Shengjiu,
On Mon, May 16, 2022 at 5:18 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
>
> ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP platforms
>
> Shengjiu Wang (3):
> ASoC: fsl_sai: Add support for i.MX8MM
> ASoC: fsl_sai: Add support for i.MX8M Plus
> ASoC: fsl_sai: Add support for i.MX8ULP
For the series:
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP
@ 2022-05-16 11:18 ` Fabio Estevam
0 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2022-05-16 11:18 UTC (permalink / raw)
To: Shengjiu Wang
Cc: Linux-ALSA, Xiubo Li, linuxppc-dev, Takashi Iwai, Liam Girdwood,
Nicolin Chen, Mark Brown, Shengjiu Wang, linux-kernel
Hi Shengjiu,
On Mon, May 16, 2022 at 5:18 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
>
> ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP platforms
>
> Shengjiu Wang (3):
> ASoC: fsl_sai: Add support for i.MX8MM
> ASoC: fsl_sai: Add support for i.MX8M Plus
> ASoC: fsl_sai: Add support for i.MX8ULP
For the series:
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP
2022-05-16 8:06 [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Shengjiu Wang
` (3 preceding siblings ...)
2022-05-16 11:18 ` Fabio Estevam
@ 2022-05-17 15:59 ` Mark Brown
4 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2022-05-17 15:59 UTC (permalink / raw)
To: tiwai, festevam, shengjiu.wang, Xiubo.Lee, alsa-devel, lgirdwood,
shengjiu.wang, perex, nicoleotsuka
Cc: linuxppc-dev, linux-kernel
On Mon, 16 May 2022 16:06:09 +0800, Shengjiu Wang wrote:
> ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP platforms
>
> Shengjiu Wang (3):
> ASoC: fsl_sai: Add support for i.MX8MM
> ASoC: fsl_sai: Add support for i.MX8M Plus
> ASoC: fsl_sai: Add support for i.MX8ULP
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: fsl_sai: Add support for i.MX8MM
commit: 9e71bc33ae0d402b1579dc7a7afb3916dd35cb17
[2/3] ASoC: fsl_sai: Add support for i.MX8M Plus
commit: 2530c5e875eab853125265b4f24a69e042d9580b
[3/3] ASoC: fsl_sai: Add support for i.MX8ULP
commit: af0bd3c0ffae8c11790ab0108787c03767869a9a
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] 8+ messages in thread
end of thread, other threads:[~2022-05-17 15:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-16 8:06 [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Shengjiu Wang
2022-05-16 8:06 ` [PATCH 1/3] ASoC: fsl_sai: Add support for i.MX8MM Shengjiu Wang
2022-05-16 8:06 ` [PATCH 2/3] ASoC: fsl_sai: Add support for i.MX8M Plus Shengjiu Wang
2022-05-16 8:06 ` [PATCH 3/3] ASoC: fsl_sai: Add support for i.MX8ULP Shengjiu Wang
2022-05-16 11:18 ` [PATCH 0/3] ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP Fabio Estevam
2022-05-16 11:18 ` Fabio Estevam
2022-05-16 11:18 ` Fabio Estevam
2022-05-17 15:59 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.