Unverified Commit baee26a9 authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown
Browse files

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: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://patch.msgid.link/20250620055229.965942-3-shengjiu.wang@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9931d289

include/linux/firmware/imx/sm.h

+6 −6
Original line number Diff line number Diff line
@@ -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 */

sound/soc/fsl/fsl_mqs.c

+1 −1
Original line number Diff line number Diff line
@@ -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,