Unverified Commit a8fffb94 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: Use generic names for IPC types 



Use the new SOF_IPC_TYPE_3, SOF_IPC_TYPE_4 in core code.

No functional changes, just renaming.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230919104226.32239-8-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/apl.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 
	/* probe/remove/shutdown */

	sof_apl_ops.shutdown	= hda_dsp_shutdown;



	if (sdev->pdata->ipc_type == SOF_IPC) {

	if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {

		/* doorbell */

		sof_apl_ops.irq_thread	= hda_dsp_ipc_irq_thread;
@@ -52,7 +52,7 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 
		sof_apl_ops.set_power_state = hda_dsp_set_power_state_ipc3;

	}



	if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {

	if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {

		struct sof_ipc4_fw_data *ipc4_data;



		sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);

sound/soc/sof/intel/bdw.c

+5 −5
Original line number Diff line number Diff line
@@ -639,16 +639,16 @@ static const struct sof_dev_desc sof_acpi_broadwell_desc = { 
	.resindex_imr_base = -1,

	.irqindex_host_ipc = 0,

	.chip_info = &bdw_chip_info,

	.ipc_supported_mask = BIT(SOF_IPC),

	.ipc_default = SOF_IPC,

	.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),

	.ipc_default = SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

		[SOF_IPC_TYPE_3] = "intel/sof",

	},

	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

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

	},

	.default_fw_filename = {

		[SOF_IPC] = "sof-bdw.ri",

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

	},

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

	.ops = &sof_bdw_ops,

sound/soc/sof/intel/byt.c

+15 −15
Original line number Diff line number Diff line
@@ -374,16 +374,16 @@ static const struct sof_dev_desc sof_acpi_baytrailcr_desc = { 
	.resindex_imr_base = 2,

	.irqindex_host_ipc = 0,

	.chip_info = &byt_chip_info,

	.ipc_supported_mask = BIT(SOF_IPC),

	.ipc_default = SOF_IPC,

	.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),

	.ipc_default = SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

		[SOF_IPC_TYPE_3] = "intel/sof",

	},

	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

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

	},

	.default_fw_filename = {

		[SOF_IPC] = "sof-byt.ri",

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

	},

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

	.ops = &sof_byt_ops,
@@ -396,16 +396,16 @@ static const struct sof_dev_desc sof_acpi_baytrail_desc = { 
	.resindex_imr_base = 2,

	.irqindex_host_ipc = 5,

	.chip_info = &byt_chip_info,

	.ipc_supported_mask = BIT(SOF_IPC),

	.ipc_default = SOF_IPC,

	.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),

	.ipc_default = SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

		[SOF_IPC_TYPE_3] = "intel/sof",

	},

	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

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

	},

	.default_fw_filename = {

		[SOF_IPC] = "sof-byt.ri",

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

	},

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

	.ops = &sof_byt_ops,
@@ -418,16 +418,16 @@ static const struct sof_dev_desc sof_acpi_cherrytrail_desc = { 
	.resindex_imr_base = 2,

	.irqindex_host_ipc = 5,

	.chip_info = &cht_chip_info,

	.ipc_supported_mask = BIT(SOF_IPC),

	.ipc_default = SOF_IPC,

	.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),

	.ipc_default = SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

		[SOF_IPC_TYPE_3] = "intel/sof",

	},

	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

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

	},

	.default_fw_filename = {

		[SOF_IPC] = "sof-cht.ri",

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

	},

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

	.ops = &sof_cht_ops,

sound/soc/sof/intel/cnl.c

+2 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev) 
	sof_cnl_ops.shutdown	= hda_dsp_shutdown;



	/* ipc */

	if (sdev->pdata->ipc_type == SOF_IPC) {

	if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {

		/* doorbell */

		sof_cnl_ops.irq_thread	= cnl_ipc_irq_thread;
@@ -399,7 +399,7 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev) 
		sof_cnl_ops.set_power_state = hda_dsp_set_power_state_ipc3;

	}



	if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {

	if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {

		struct sof_ipc4_fw_data *ipc4_data;



		sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);

sound/soc/sof/intel/hda-dai-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ hda_select_dai_widget_ops(struct snd_sof_dev *sdev, struct snd_sof_widget *swidg 
	sdai = swidget->private;



	switch (sdev->pdata->ipc_type) {

	case SOF_IPC:

	case SOF_IPC_TYPE_3:

	{

		struct sof_dai_private_data *private = sdai->private;
@@ -617,7 +617,7 @@ hda_select_dai_widget_ops(struct snd_sof_dev *sdev, struct snd_sof_widget *swidg 
			return &hda_ipc3_dma_ops;

		break;

	}

	case SOF_INTEL_IPC4:

	case SOF_IPC_TYPE_4:

	{

		struct sof_ipc4_copier *ipc4_copier = sdai->private;

		const struct sof_intel_dsp_desc *chip;