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: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Chao Song <chao.song@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20221020121238.18339-13-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
index 998e219011f01c64273babb746fcbabdfef15440..69279dcc92dc136630fed5a7ab3860a9f5540091 100644 (file)
--- a/sound/soc/sof/intel/pci-apl.c
+++ b/sound/soc/sof/intel/pci-apl.c
@@ -33,6 +33,9 @@ static const struct sof_dev_desc bxt_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/apl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/apl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -61,6 +64,9 @@ static const struct sof_dev_desc glk_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/glk",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/glk",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",

diff --git a/sound/soc/sof/intel/pci-cnl.c b/sound/soc/sof/intel/pci-cnl.c
index c797356f7028b2d39a0b47f054b5867d18e33986..8db3f8d15b55e9f6f708b91a9f11b5fe136ca774 100644 (file)
--- a/sound/soc/sof/intel/pci-cnl.c
+++ b/sound/soc/sof/intel/pci-cnl.c
@@ -34,6 +34,9 @@ static const struct sof_dev_desc cnl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/cnl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -62,6 +65,9 @@ static const struct sof_dev_desc cfl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/cnl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -91,6 +97,9 @@ static const struct sof_dev_desc cml_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/cnl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",

diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
index 48f24f8ace26184041e352dbb760f368e7e9108f..d6cf75e357dbf07c9b1e89894cb8fa530d3e26a6 100644 (file)
--- a/sound/soc/sof/intel/pci-icl.c
+++ b/sound/soc/sof/intel/pci-icl.c
@@ -34,6 +34,9 @@ static const struct sof_dev_desc icl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/icl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/icl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -62,6 +65,9 @@ static const struct sof_dev_desc jsl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/jsl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/jsl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",

diff --git a/sound/soc/sof/intel/pci-mtl.c b/sound/soc/sof/intel/pci-mtl.c
index 9f39da984e9fa26a069dbf97c59cd700b6d456f3..6e4e6d4ef5a5649e781bbb78e053bb5b3f9edbb1 100644 (file)
--- a/sound/soc/sof/intel/pci-mtl.c
+++ b/sound/soc/sof/intel/pci-mtl.c
@@ -34,6 +34,9 @@ static const struct sof_dev_desc mtl_desc = {
        .default_fw_path = {
                [SOF_INTEL_IPC4] = "intel/sof-ipc4/mtl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/sof-ipc4-lib/mtl",
+       },
        .default_tplg_path = {
                [SOF_INTEL_IPC4] = "intel/sof-ace-tplg",
        },

diff --git a/sound/soc/sof/intel/pci-tgl.c b/sound/soc/sof/intel/pci-tgl.c
index 757a7c6bb770c1324a0c867f22cc2e7b2d421663..e80c4dfef85a58d71d0db6246199fe55c8b64336 100644 (file)
--- a/sound/soc/sof/intel/pci-tgl.c
+++ b/sound/soc/sof/intel/pci-tgl.c
@@ -34,6 +34,9 @@ static const struct sof_dev_desc tgl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/tgl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/tgl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -62,6 +65,9 @@ static const struct sof_dev_desc tglh_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/tgl-h",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/tgl-h",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -90,6 +96,9 @@ static const struct sof_dev_desc ehl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/ehl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/ehl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -118,6 +127,9 @@ static const struct sof_dev_desc adls_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/adl-s",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/adl-s",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -146,6 +158,9 @@ static const struct sof_dev_desc adl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/adl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/adl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -205,6 +220,9 @@ static const struct sof_dev_desc rpls_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/rpl-s",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/rpl-s",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",
@@ -233,6 +251,9 @@ static const struct sof_dev_desc rpl_desc = {
                [SOF_IPC] = "intel/sof",
                [SOF_INTEL_IPC4] = "intel/avs/rpl",
        },
+       .default_lib_path = {
+               [SOF_INTEL_IPC4] = "intel/avs-lib/rpl",
+       },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
                [SOF_INTEL_IPC4] = "intel/avs-tplg",