Unverified Commit dba2d5ae authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP 

Merge series from Shengjiu Wang <shengjiu.wang@nxp.com>:

ASoC: fsl_sai: Add support for i.MX8MM, MP, ULP platforms
parents 0af9de0e af0bd3c0

sound/soc/fsl/fsl_sai.c

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

	}
@@ -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,40 @@ 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 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 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[] = {
@@ -1252,6 +1290,9 @@ 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 },

	{ .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);

sound/soc/fsl/fsl_sai.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ struct fsl_sai_soc_data { 
	unsigned int pins;

	unsigned int reg_offset;

	unsigned int flags;

	unsigned int max_register;

};



/**