Unverified Commit 563e4015 authored by Laurentiu Mihalcea's avatar Laurentiu Mihalcea Committed by Mark Brown
Browse files

ASoC: SOF: imx8: use IMX_SOF_* macros 



The definition of 'struct sof_dev_desc' has the following properties
for imx chips:

  1) FW path is the same for all chips.
  2) Topology path is the same for all chips.
  3) FW name can be written as: "sof-${machine_name}.ri"
  4) IPC3 is the only supported protocol

The structure takes quite a few lines of code. Since the intention
is to add support for more imx8 chips in the same driver, we need
to try and reduce the number of lines taken by information that's
not particularly useful. As such, we can use 'IMX_SOF_DEV_DESC()'
to reduce the declaration of the structure to just one line. The
only information that's particularly useful can be seen from the
parameters of the macro.

Of course, if any of the assumptions don't apply anymore, driver
writers can simply declare the 'struct sof_dev_desc' the "old
fashioned way". No reason to make the macro suit multiple needs.

The same logic applies to the array of 'struct snd_soc_dai_driver'.

Signed-off-by: default avatarLaurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarIuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20250207162246.3104-4-laurentiumihalcea111@gmail.com


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

sound/soc/sof/imx/imx8.c

+11 −60
Original line number Diff line number Diff line
@@ -119,28 +119,8 @@ static int imx8_probe(struct snd_sof_dev *sdev) 
}



static struct snd_soc_dai_driver imx8_dai[] = {

{

	.name = "esai0",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

{

	.name = "sai1",

	.playback = {

		.channels_min = 1,

		.channels_max = 32,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 32,

	},

},

	IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8),

	IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32),

};



static struct snd_sof_dsp_ops sof_imx8_ops;
@@ -238,47 +218,18 @@ static struct snd_sof_of_mach sof_imx8_machs[] = { 
	{}

};



static struct sof_dev_desc sof_of_imx8qxp_desc = {

	.of_machines	= sof_imx8_machs,

	.chip_info	= &imx8x_chip_info,

	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_3),

	.ipc_default		= SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "imx/sof",

	},

	.default_tplg_path = {

		[SOF_IPC_TYPE_3] = "imx/sof-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_3] = "sof-imx8x.ri",

	},

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8_ops,

	.ops_init = imx8_ops_init,

};

IMX_SOF_DEV_DESC(imx8, sof_imx8_machs, &imx8_chip_info, &sof_imx8_ops, imx8_ops_init);

IMX_SOF_DEV_DESC(imx8x, sof_imx8_machs, &imx8x_chip_info, &sof_imx8_ops, imx8_ops_init);



static struct sof_dev_desc sof_of_imx8qm_desc = {

	.of_machines	= sof_imx8_machs,

	.chip_info	= &imx8_chip_info,

	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_3),

	.ipc_default		= SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "imx/sof",

	},

	.default_tplg_path = {

		[SOF_IPC_TYPE_3] = "imx/sof-tplg",

static const struct of_device_id sof_of_imx8_ids[] = {

	{

		.compatible = "fsl,imx8qxp-dsp",

		.data = &IMX_SOF_DEV_DESC_NAME(imx8x),

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_3] = "sof-imx8.ri",

	{

		.compatible = "fsl,imx8qm-dsp",

		.data = &IMX_SOF_DEV_DESC_NAME(imx8),

	},

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8_ops,

	.ops_init = imx8_ops_init,

};



static const struct of_device_id sof_of_imx8_ids[] = {

	{ .compatible = "fsl,imx8qxp-dsp", .data = &sof_of_imx8qxp_desc},

	{ .compatible = "fsl,imx8qm-dsp", .data = &sof_of_imx8qm_desc},

	{ }

};

MODULE_DEVICE_TABLE(of, sof_of_imx8_ids);