Commit cd6f2a2e authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: SOF: Intel: Set the default firmware library path for IPC4

The default path for the external firmware libraries are:
intel/avs-lib/<platform>
or
intel/sof-ipc4-lib/<platform>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarChao Song <chao.song@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20221020121238.18339-13-peter.ujfalusi@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 25bbc0c5
...@@ -33,6 +33,9 @@ static const struct sof_dev_desc bxt_desc = { ...@@ -33,6 +33,9 @@ static const struct sof_dev_desc bxt_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/apl", [SOF_INTEL_IPC4] = "intel/avs/apl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/apl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -61,6 +64,9 @@ static const struct sof_dev_desc glk_desc = { ...@@ -61,6 +64,9 @@ static const struct sof_dev_desc glk_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/glk", [SOF_INTEL_IPC4] = "intel/avs/glk",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/glk",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
......
...@@ -34,6 +34,9 @@ static const struct sof_dev_desc cnl_desc = { ...@@ -34,6 +34,9 @@ static const struct sof_dev_desc cnl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/cnl", [SOF_INTEL_IPC4] = "intel/avs/cnl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -62,6 +65,9 @@ static const struct sof_dev_desc cfl_desc = { ...@@ -62,6 +65,9 @@ static const struct sof_dev_desc cfl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/cnl", [SOF_INTEL_IPC4] = "intel/avs/cnl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -91,6 +97,9 @@ static const struct sof_dev_desc cml_desc = { ...@@ -91,6 +97,9 @@ static const struct sof_dev_desc cml_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/cnl", [SOF_INTEL_IPC4] = "intel/avs/cnl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
......
...@@ -34,6 +34,9 @@ static const struct sof_dev_desc icl_desc = { ...@@ -34,6 +34,9 @@ static const struct sof_dev_desc icl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/icl", [SOF_INTEL_IPC4] = "intel/avs/icl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/icl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -62,6 +65,9 @@ static const struct sof_dev_desc jsl_desc = { ...@@ -62,6 +65,9 @@ static const struct sof_dev_desc jsl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/jsl", [SOF_INTEL_IPC4] = "intel/avs/jsl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/jsl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
......
...@@ -34,6 +34,9 @@ static const struct sof_dev_desc mtl_desc = { ...@@ -34,6 +34,9 @@ static const struct sof_dev_desc mtl_desc = {
.default_fw_path = { .default_fw_path = {
[SOF_INTEL_IPC4] = "intel/sof-ipc4/mtl", [SOF_INTEL_IPC4] = "intel/sof-ipc4/mtl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/sof-ipc4-lib/mtl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_INTEL_IPC4] = "intel/sof-ace-tplg", [SOF_INTEL_IPC4] = "intel/sof-ace-tplg",
}, },
......
...@@ -34,6 +34,9 @@ static const struct sof_dev_desc tgl_desc = { ...@@ -34,6 +34,9 @@ static const struct sof_dev_desc tgl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/tgl", [SOF_INTEL_IPC4] = "intel/avs/tgl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/tgl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -62,6 +65,9 @@ static const struct sof_dev_desc tglh_desc = { ...@@ -62,6 +65,9 @@ static const struct sof_dev_desc tglh_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/tgl-h", [SOF_INTEL_IPC4] = "intel/avs/tgl-h",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/tgl-h",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -90,6 +96,9 @@ static const struct sof_dev_desc ehl_desc = { ...@@ -90,6 +96,9 @@ static const struct sof_dev_desc ehl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/ehl", [SOF_INTEL_IPC4] = "intel/avs/ehl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/ehl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -118,6 +127,9 @@ static const struct sof_dev_desc adls_desc = { ...@@ -118,6 +127,9 @@ static const struct sof_dev_desc adls_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/adl-s", [SOF_INTEL_IPC4] = "intel/avs/adl-s",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/adl-s",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -146,6 +158,9 @@ static const struct sof_dev_desc adl_desc = { ...@@ -146,6 +158,9 @@ static const struct sof_dev_desc adl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/adl", [SOF_INTEL_IPC4] = "intel/avs/adl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/adl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -205,6 +220,9 @@ static const struct sof_dev_desc rpls_desc = { ...@@ -205,6 +220,9 @@ static const struct sof_dev_desc rpls_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/rpl-s", [SOF_INTEL_IPC4] = "intel/avs/rpl-s",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/rpl-s",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
...@@ -233,6 +251,9 @@ static const struct sof_dev_desc rpl_desc = { ...@@ -233,6 +251,9 @@ static const struct sof_dev_desc rpl_desc = {
[SOF_IPC] = "intel/sof", [SOF_IPC] = "intel/sof",
[SOF_INTEL_IPC4] = "intel/avs/rpl", [SOF_INTEL_IPC4] = "intel/avs/rpl",
}, },
.default_lib_path = {
[SOF_INTEL_IPC4] = "intel/avs-lib/rpl",
},
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "intel/sof-tplg", [SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg", [SOF_INTEL_IPC4] = "intel/avs-tplg",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment