Unverified Commit 9dbe95e2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Intel: pci-tgl/lnl: Change default paths 

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

Hi,

Align the IPC4 firmware path/name and the topology path to the documentation:
default_fw_path:     intel/sof-ipc4/{platform_name}
default_lib_path:    intel/sof-ipc4-lib/{platform_name}
default_tplg_path:   intel/sof-ipc4-tplg
default_fw_filename: sof-{platform_name}.ri

Tiger Lake and Lunar Lake support is not yet available via the official
firmware release, the paths can be changed now to avoid misalignment in the
future.

Regards,
Peter
---
Peter Ujfalusi (2):
  ASoC: SOF: Intel: pci-tgl: Change the default paths and firmware names
  ASoC: SOF: Intel: pci-lnl: Change the topology path to
    intel/sof-ipc4-tplg

 sound/soc/sof/intel/pci-lnl.c |  2 +-
 sound/soc/sof/intel/pci-tgl.c | 64 +++++++++++++++++------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

--
2.43.0
parents fcbe4873 b0294820

sound/soc/sof/intel/pci-lnl.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static const struct sof_dev_desc lnl_desc = { 
		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/lnl",

	},

	.default_tplg_path = {

		[SOF_IPC_TYPE_4] = "intel/sof-ace-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_4] = "sof-lnl.ri",

sound/soc/sof/intel/pci-tgl.c

+32 −32
Original line number Diff line number Diff line
@@ -33,18 +33,18 @@ static const struct sof_dev_desc tgl_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/tgl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/tgl",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/tgl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/tgl",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-tgl.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -66,18 +66,18 @@ static const struct sof_dev_desc tglh_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/tgl-h",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/tgl-h",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/tgl-h",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/tgl-h",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_3] = "sof-tgl-h.ri",

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-tgl-h.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -98,18 +98,18 @@ static const struct sof_dev_desc ehl_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/ehl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/ehl",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/ehl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/ehl",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-ehl.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -131,18 +131,18 @@ static const struct sof_dev_desc adls_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/adl-s",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/adl-s",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/adl-s",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/adl-s",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_3] = "sof-adl-s.ri",

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-adl-s.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -164,18 +164,18 @@ static const struct sof_dev_desc adl_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/adl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/adl",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/adl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/adl",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-adl.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -197,18 +197,18 @@ static const struct sof_dev_desc adl_n_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/adl-n",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/adl-n",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/adl-n",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/adl-n",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_3] = "sof-adl-n.ri",

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-adl-n.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -230,18 +230,18 @@ static const struct sof_dev_desc rpls_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/rpl-s",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/rpl-s",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/rpl-s",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/rpl-s",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC_TYPE_3] = "sof-rpl-s.ri",

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-rpl-s.ri",

	},

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

	.ops = &sof_tgl_ops,
@@ -263,18 +263,18 @@ static const struct sof_dev_desc rpl_desc = { 
	.dspless_mode_supported	= true,		/* Only supported for HDaudio */

	.default_fw_path = {

		[SOF_IPC_TYPE_3] = "intel/sof",

		[SOF_IPC_TYPE_4] = "intel/avs/rpl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4/rpl",

	},

	.default_lib_path = {

		[SOF_IPC_TYPE_4] = "intel/avs-lib/rpl",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/rpl",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_4] = "intel/avs-tplg",

		[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_4] = "dsp_basefw.bin",

		[SOF_IPC_TYPE_4] = "sof-rpl.ri",

	},

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

	.ops = &sof_tgl_ops,