ASoC: fsl_mqs: rename system manager indices for i.MX95

The system manager indices names are different for each platform, rename
the indices for i.MX95 to differentiate with other platform.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Link: https://patch.msgid.link/20250620055229.965942-3-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/linux/firmware/imx/sm.h b/include/linux/firmware/imx/sm.h
index a6220c500f7c1693be3c5355ba97c04a6cb7b12b..d4212bc42b2c17fb8f94d58856a75beb5611ce4b 100644 (file)
--- a/include/linux/firmware/imx/sm.h
+++ b/include/linux/firmware/imx/sm.h
@@ -11,12 +11,12 @@
 #include <linux/scmi_imx_protocol.h>
 #include <linux/types.h>
 
-#define SCMI_IMX_CTRL_PDM_CLK_SEL      0       /* AON PDM clock sel */
-#define SCMI_IMX_CTRL_MQS1_SETTINGS    1       /* AON MQS settings */
-#define SCMI_IMX_CTRL_SAI1_MCLK                2       /* AON SAI1 MCLK */
-#define SCMI_IMX_CTRL_SAI3_MCLK                3       /* WAKE SAI3 MCLK */
-#define SCMI_IMX_CTRL_SAI4_MCLK                4       /* WAKE SAI4 MCLK */
-#define SCMI_IMX_CTRL_SAI5_MCLK                5       /* WAKE SAI5 MCLK */
+#define SCMI_IMX95_CTRL_PDM_CLK_SEL    0       /* AON PDM clock sel */
+#define SCMI_IMX95_CTRL_MQS1_SETTINGS  1       /* AON MQS settings */
+#define SCMI_IMX95_CTRL_SAI1_MCLK      2       /* AON SAI1 MCLK */
+#define SCMI_IMX95_CTRL_SAI3_MCLK      3       /* WAKE SAI3 MCLK */
+#define SCMI_IMX95_CTRL_SAI4_MCLK      4       /* WAKE SAI4 MCLK */
+#define SCMI_IMX95_CTRL_SAI5_MCLK      5       /* WAKE SAI5 MCLK */
 
 #define SCMI_IMX94_CTRL_PDM_CLK_SEL    0U      /*!< AON PDM clock sel */
 #define SCMI_IMX94_CTRL_MQS1_SETTINGS  1U      /*!< AON MQS settings */

diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c
index 11f2f3792dcee6b039d63a52943f8d7481c0ca81..901f840df90474ff33f832b8074e13c5fbb866f8 100644 (file)
--- a/sound/soc/fsl/fsl_mqs.c
+++ b/sound/soc/fsl/fsl_mqs.c
@@ -388,7 +388,7 @@ static const struct fsl_mqs_soc_data fsl_mqs_imx93_data = {
 
 static const struct fsl_mqs_soc_data fsl_mqs_imx95_aon_data = {
        .type = TYPE_REG_SM,
-       .sm_index = SCMI_IMX_CTRL_MQS1_SETTINGS,
+       .sm_index = SCMI_IMX95_CTRL_MQS1_SETTINGS,
        .ctrl_off = 0x88,
        .en_mask  = BIT(1),
        .en_shift = 1,