1. Patchew
  2. linux
  3. View series

[PATCH] ASoC: fsl_mqs: Support accessing registers by scmi interface

Shengjiu Wang posted 1 patch 1 year, 4 months ago
There is a newer version of this series
sound/soc/fsl/fsl_mqs.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
[PATCH] ASoC: fsl_mqs: Support accessing registers by scmi interface
Posted by Shengjiu Wang 1 year, 4 months ago 
On i.MX95, the MQS module in Always-on (AON) domain only can
be accessed by System Controller Management Interface (SCMI)
MISC Protocol. So define a specific regmap_config for the case.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 sound/soc/fsl/fsl_mqs.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c
index 145f9ca15e43..0513e9e8402e 100644
--- a/sound/soc/fsl/fsl_mqs.c
+++ b/sound/soc/fsl/fsl_mqs.c
@@ -6,6 +6,7 @@
 // Copyright 2019 NXP
 
 #include <linux/clk.h>
+#include <linux/firmware/imx/sm.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/mfd/syscon.h>
@@ -74,6 +75,29 @@ struct fsl_mqs {
 #define FSL_MQS_RATES	(SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
 #define FSL_MQS_FORMATS	SNDRV_PCM_FMTBIT_S16_LE
 
+static int fsl_mqs_sm_read(void *context, unsigned int reg, unsigned int *val)
+{
+	struct fsl_mqs *mqs_priv = context;
+	int num = 1;
+
+	if (IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV) &&
+	    mqs_priv->soc->ctrl_off == reg)
+		return scmi_imx_misc_ctrl_get(SCMI_IMX_CTRL_MQS1_SETTINGS, &num, val);
+
+	return -EINVAL;
+};
+
+static int fsl_mqs_sm_write(void *context, unsigned int reg, unsigned int val)
+{
+	struct fsl_mqs *mqs_priv = context;
+
+	if (IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV) &&
+	    mqs_priv->soc->ctrl_off == reg)
+		return scmi_imx_misc_ctrl_set(SCMI_IMX_CTRL_MQS1_SETTINGS, val);
+
+	return -EINVAL;
+};
+
 static int fsl_mqs_hw_params(struct snd_pcm_substream *substream,
 			     struct snd_pcm_hw_params *params,
 			     struct snd_soc_dai *dai)
@@ -188,6 +212,13 @@ static const struct regmap_config fsl_mqs_regmap_config = {
 	.cache_type = REGCACHE_NONE,
 };
 
+static const struct regmap_config fsl_mqs_sm_regmap = {
+	.reg_bits = 32,
+	.val_bits = 32,
+	.reg_read = fsl_mqs_sm_read,
+	.reg_write = fsl_mqs_sm_write,
+};
+
 static int fsl_mqs_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -219,6 +250,16 @@ static int fsl_mqs_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev, "failed to get gpr regmap\n");
 			return PTR_ERR(mqs_priv->regmap);
 		}
+	} else if (mqs_priv->soc->type == TYPE_REG_SM) {
+		mqs_priv->regmap = devm_regmap_init(&pdev->dev,
+						    NULL,
+						    mqs_priv,
+						    &fsl_mqs_sm_regmap);
+		if (IS_ERR(mqs_priv->regmap)) {
+			dev_err(&pdev->dev, "failed to init regmap: %ld\n",
+				PTR_ERR(mqs_priv->regmap));
+			return PTR_ERR(mqs_priv->regmap);
+		}
 	} else {
 		regs = devm_platform_ioremap_resource(pdev, 0);
 		if (IS_ERR(regs))
-- 
2.34.1
Re: [PATCH] ASoC: fsl_mqs: Support accessing registers by scmi interface
Posted by Shengjiu Wang 1 year, 3 months ago 
On Sat, Oct 12, 2024 at 2:15 PM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
>
> On i.MX95, the MQS module in Always-on (AON) domain only can
> be accessed by System Controller Management Interface (SCMI)
> MISC Protocol. So define a specific regmap_config for the case.
>

find an issue when IMX_SCMI_MISC_DRV=m but SND_SOC_FSL_MQS=y
will send v2 to fix it.

Best regards
Shengjiu Wang

> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
>  sound/soc/fsl/fsl_mqs.c | 41 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 41 insertions(+)
>
> diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c
> index 145f9ca15e43..0513e9e8402e 100644
> --- a/sound/soc/fsl/fsl_mqs.c
> +++ b/sound/soc/fsl/fsl_mqs.c
> @@ -6,6 +6,7 @@
>  // Copyright 2019 NXP
>
>  #include <linux/clk.h>
> +#include <linux/firmware/imx/sm.h>
>  #include <linux/module.h>
>  #include <linux/moduleparam.h>
>  #include <linux/mfd/syscon.h>
> @@ -74,6 +75,29 @@ struct fsl_mqs {
>  #define FSL_MQS_RATES  (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
>  #define FSL_MQS_FORMATS        SNDRV_PCM_FMTBIT_S16_LE
>
> +static int fsl_mqs_sm_read(void *context, unsigned int reg, unsigned int *val)
> +{
> +       struct fsl_mqs *mqs_priv = context;
> +       int num = 1;
> +
> +       if (IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV) &&
> +           mqs_priv->soc->ctrl_off == reg)
> +               return scmi_imx_misc_ctrl_get(SCMI_IMX_CTRL_MQS1_SETTINGS, &num, val);
> +
> +       return -EINVAL;
> +};
> +
> +static int fsl_mqs_sm_write(void *context, unsigned int reg, unsigned int val)
> +{
> +       struct fsl_mqs *mqs_priv = context;
> +
> +       if (IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV) &&
> +           mqs_priv->soc->ctrl_off == reg)
> +               return scmi_imx_misc_ctrl_set(SCMI_IMX_CTRL_MQS1_SETTINGS, val);
> +
> +       return -EINVAL;
> +};
> +
>  static int fsl_mqs_hw_params(struct snd_pcm_substream *substream,
>                              struct snd_pcm_hw_params *params,
>                              struct snd_soc_dai *dai)
> @@ -188,6 +212,13 @@ static const struct regmap_config fsl_mqs_regmap_config = {
>         .cache_type = REGCACHE_NONE,
>  };
>
> +static const struct regmap_config fsl_mqs_sm_regmap = {
> +       .reg_bits = 32,
> +       .val_bits = 32,
> +       .reg_read = fsl_mqs_sm_read,
> +       .reg_write = fsl_mqs_sm_write,
> +};
> +
>  static int fsl_mqs_probe(struct platform_device *pdev)
>  {
>         struct device_node *np = pdev->dev.of_node;
> @@ -219,6 +250,16 @@ static int fsl_mqs_probe(struct platform_device *pdev)
>                         dev_err(&pdev->dev, "failed to get gpr regmap\n");
>                         return PTR_ERR(mqs_priv->regmap);
>                 }
> +       } else if (mqs_priv->soc->type == TYPE_REG_SM) {
> +               mqs_priv->regmap = devm_regmap_init(&pdev->dev,
> +                                                   NULL,
> +                                                   mqs_priv,
> +                                                   &fsl_mqs_sm_regmap);
> +               if (IS_ERR(mqs_priv->regmap)) {
> +                       dev_err(&pdev->dev, "failed to init regmap: %ld\n",
> +                               PTR_ERR(mqs_priv->regmap));
> +                       return PTR_ERR(mqs_priv->regmap);
> +               }
>         } else {
>                 regs = devm_platform_ioremap_resource(pdev, 0);
>                 if (IS_ERR(regs))
> --
> 2.34.1
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.