Unverified Commit 3fd61ce9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Use generic IPC type identifiers 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Hi,

rename the IPC type defines to be more generic and intuitive:
SOF_IPC -> SOF_IPC_TYPE_3
SOF_INTEL_IPC4 -> SOF_IPC_TYPE_4

No functional change, just renaming all around.

Regards,
Peter
---
Peter Ujfalusi (9):
  ASoC: SOF: Introduce generic names for IPC types
  ASoC: SOF: sof-pci-dev: Update the ipc_type module parameter
    description
  ASoC: SOF: Kconfig: Rename SND_SOC_SOF_INTEL_IPC4 to SND_SOC_SOF_IPC4
  ASoC: SOF: Use generic names for IPC types
  ASoC: SOF: amd: Use generic names for IPC types
  ASoC: SOF: imx: Use generic names for IPC types
  ASoC: SOF: Intel: Use generic names for IPC types
  ASoC: SOF: mediatek: Use generic names for IPC types
  ASoC: SOF: Drop unused IPC type defines

 include/sound/sof.h                         |   4 +-
 sound/soc/sof/Kconfig                       |   2 +-
 sound/soc/sof/Makefile                      |   4 +-
 sound/soc/sof/amd/pci-rmb.c                 |  10 +-
 sound/soc/sof/amd/pci-rn.c                  |  10 +-
 sound/soc/sof/amd/pci-vangogh.c             |  10 +-
 sound/soc/sof/imx/imx8.c                    |  20 +--
 sound/soc/sof/imx/imx8m.c                   |  10 +-
 sound/soc/sof/imx/imx8ulp.c                 |  10 +-
 sound/soc/sof/intel/Kconfig                 |  14 +-
 sound/soc/sof/intel/apl.c                   |   4 +-
 sound/soc/sof/intel/bdw.c                   |  10 +-
 sound/soc/sof/intel/byt.c                   |  30 ++--
 sound/soc/sof/intel/cnl.c                   |   4 +-
 sound/soc/sof/intel/hda-dai-ops.c           |   4 +-
 sound/soc/sof/intel/hda-dai.c               |   4 +-
 sound/soc/sof/intel/hda-loader.c            |   2 +-
 sound/soc/sof/intel/hda.c                   |   2 +-
 sound/soc/sof/intel/icl.c                   |   4 +-
 sound/soc/sof/intel/pci-apl.c               |  36 ++---
 sound/soc/sof/intel/pci-cnl.c               |  54 ++++----
 sound/soc/sof/intel/pci-icl.c               |  36 ++---
 sound/soc/sof/intel/pci-lnl.c               |  10 +-
 sound/soc/sof/intel/pci-mtl.c               |  12 +-
 sound/soc/sof/intel/pci-skl.c               |  20 +--
 sound/soc/sof/intel/pci-tgl.c               | 144 ++++++++++----------
 sound/soc/sof/intel/pci-tng.c               |  10 +-
 sound/soc/sof/intel/tgl.c                   |   4 +-
 sound/soc/sof/ipc.c                         |   6 +-
 sound/soc/sof/ipc3-dtrace.c                 |   2 +-
 sound/soc/sof/mediatek/mt8186/mt8186.c      |  20 +--
 sound/soc/sof/mediatek/mt8195/mt8195.c      |  10 +-
 sound/soc/sof/sof-acpi-dev.c                |   8 +-
 sound/soc/sof/sof-client-ipc-msg-injector.c |   4 +-
 sound/soc/sof/sof-client-probes.c           |   6 +-
 sound/soc/sof/sof-client.c                  |  26 ++--
 sound/soc/sof/sof-of-dev.c                  |   6 +-
 sound/soc/sof/sof-pci-dev.c                 |   2 +-
 38 files changed, 286 insertions(+), 288 deletions(-)

--
2.42.0
parents 842a62a7 7b5300e9

include/sound/sof.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ enum sof_dsp_power_states { 


/* Definitions for multiple IPCs */

enum sof_ipc_type {

	SOF_IPC,

	SOF_INTEL_IPC4,

	SOF_IPC_TYPE_3,

	SOF_IPC_TYPE_4,

	SOF_IPC_TYPE_COUNT

};

sound/soc/sof/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ config SND_SOC_SOF_PROBE_WORK_QUEUE 
config SND_SOC_SOF_IPC3

	bool



config SND_SOC_SOF_INTEL_IPC4

config SND_SOC_SOF_IPC4

	bool



source "sound/soc/sof/amd/Kconfig"

sound/soc/sof/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ifneq ($(CONFIG_SND_SOC_SOF_IPC3),) 
snd-sof-objs +=	ipc3.o ipc3-loader.o ipc3-topology.o ipc3-control.o ipc3-pcm.o\

		ipc3-dtrace.o

endif

ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)

ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)

snd-sof-objs += ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o\

		ipc4-mtrace.o

endif
@@ -31,7 +31,7 @@ snd-sof-probes-objs := sof-client-probes.o 
ifneq ($(CONFIG_SND_SOC_SOF_IPC3),)

snd-sof-probes-objs += sof-client-probes-ipc3.o

endif

ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)

ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)

snd-sof-probes-objs += sof-client-probes-ipc4.o

endif

sound/soc/sof/amd/pci-rmb.c

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

	.irqindex_host_ipc	= -1,

	.chip_info		= &rembrandt_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] = "amd/sof",

		[SOF_IPC_TYPE_3] = "amd/sof",

	},

	.default_tplg_path	= {

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

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

	},

	.default_fw_filename	= {

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

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

	},

	.nocodec_tplg_filename	= "sof-acp.tplg",

	.ops			= &sof_rembrandt_ops,

sound/soc/sof/amd/pci-rn.c

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

	.irqindex_host_ipc	= -1,

	.chip_info		= &renoir_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] = "amd/sof",

		[SOF_IPC_TYPE_3] = "amd/sof",

	},

	.default_tplg_path = {

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

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

	},

	.default_fw_filename	= {

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

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

	},

	.nocodec_tplg_filename	= "sof-acp.tplg",

	.ops			= &sof_renoir_ops,