ASoC: SOF: add platform name into sof_intel_dsp_desc

The platform name will be used construct the topology name.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Simon Trimmer <simont@opensource.cirrus.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20251014071335.3844631-7-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index 76a92eaa1359de667c2d954beceba1d0d58e0a24..0c68ae41a8a865146d6a88c6f0908d8afa28d18b 100644 (file)
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -118,4 +118,5 @@ const struct sof_intel_dsp_desc apl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_1_5_PLUS,
+       .platform = "apl",
 };

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index 385e5339f0a4b7a26ac5677cc3c4d7f74c8a511a..dfef908554b3fe68910cac8d7bafac71d21516f6 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -479,6 +479,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_1_8,
+       .platform = "cnl",
 };
 
 /*
@@ -515,5 +516,6 @@ const struct sof_intel_dsp_desc jsl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_2_0,
+       .platform = "jsl",
 };
 EXPORT_SYMBOL_NS(jsl_chip_info, "SND_SOC_SOF_INTEL_CNL");

diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index dad6bc72ad37a0373ce5d4f790ac5395a749e908..dbc5ad62258b19b2b1d6918d731cc651429bdba1 100644 (file)
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -193,4 +193,5 @@ const struct sof_intel_dsp_desc icl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_2_0,
+       .platform = "icl",
 };

diff --git a/sound/soc/sof/intel/lnl.c b/sound/soc/sof/intel/lnl.c
index 2f3222040f98fd971178584d91d430723fe5bae2..c01ea7e731aabf84e3849c8f4bf77a698345059c 100644 (file)
--- a/sound/soc/sof/intel/lnl.c
+++ b/sound/soc/sof/intel/lnl.c
@@ -183,6 +183,7 @@ const struct sof_intel_dsp_desc lnl_chip_info = {
        .power_down_dsp = mtl_power_down_dsp,
        .disable_interrupts = lnl_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_ACE_2_0,
+       .platform = "lnl",
 };
 
 MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_MTL");

diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
index 2242c96bfa5197ce15135ce21fdb3542e07a1860..095dcf1a18e4f2c406148dbbffa69b836a68970c 100644 (file)
--- a/sound/soc/sof/intel/mtl.c
+++ b/sound/soc/sof/intel/mtl.c
@@ -786,6 +786,7 @@ const struct sof_intel_dsp_desc mtl_chip_info = {
        .power_down_dsp = mtl_power_down_dsp,
        .disable_interrupts = mtl_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_ACE_1_0,
+       .platform = "mtl",
 };
 
 const struct sof_intel_dsp_desc arl_s_chip_info = {
@@ -814,4 +815,5 @@ const struct sof_intel_dsp_desc arl_s_chip_info = {
        .power_down_dsp = mtl_power_down_dsp,
        .disable_interrupts = mtl_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_ACE_1_0,
+       .platform = "arl",
 };

diff --git a/sound/soc/sof/intel/ptl.c b/sound/soc/sof/intel/ptl.c
index 4633cd01e7dd4b5749cc09e33689e443e726b3c5..c1db735237f85eb131c1e3c1131660d220a63c61 100644 (file)
--- a/sound/soc/sof/intel/ptl.c
+++ b/sound/soc/sof/intel/ptl.c
@@ -125,6 +125,7 @@ const struct sof_intel_dsp_desc ptl_chip_info = {
        .power_down_dsp = mtl_power_down_dsp,
        .disable_interrupts = lnl_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_ACE_3_0,
+       .platform = "ptl",
 };
 
 const struct sof_intel_dsp_desc wcl_chip_info = {
@@ -149,6 +150,7 @@ const struct sof_intel_dsp_desc wcl_chip_info = {
        .power_down_dsp = mtl_power_down_dsp,
        .disable_interrupts = lnl_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_ACE_3_0,
+       .platform = "wcl",
 };
 
 MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_MTL");

diff --git a/sound/soc/sof/intel/shim.h b/sound/soc/sof/intel/shim.h
index d4372f0bff7e75ae76ec90935ef4b6ae52b5dda3..dc6a93d05bfea6eedb72e932230be5d24b5df153 100644 (file)
--- a/sound/soc/sof/intel/shim.h
+++ b/sound/soc/sof/intel/shim.h
@@ -186,6 +186,7 @@ struct sof_intel_dsp_desc {
        u32 sdw_alh_base;
        u32 d0i3_offset;
        u32 quirks;
+       const char *platform;
        enum sof_intel_hw_ip_version hw_ip_version;
        int (*read_sdw_lcount)(struct snd_sof_dev *sdev);
        void (*enable_sdw_irq)(struct snd_sof_dev *sdev, bool enable);

diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c
index 0696bce65e33ef7f4708bf0411d88871e3cf8a87..90a3c2e2334cd2b55e590928464472ef5e607ad0 100644 (file)
--- a/sound/soc/sof/intel/skl.c
+++ b/sound/soc/sof/intel/skl.c
@@ -113,5 +113,6 @@ const struct sof_intel_dsp_desc skl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_1_5,
+       .platform = "skl",
 };
 EXPORT_SYMBOL_NS(skl_chip_info, "SND_SOC_SOF_INTEL_HDA_COMMON");

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index df2d26b78ddc21f16d217a15d299ea5980c8a947..e68bbe685ba3d6785f04c0b8d1b83aeb1155de93 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -162,6 +162,7 @@ const struct sof_intel_dsp_desc tgl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_2_5,
+       .platform = "tgl",
 };
 
 const struct sof_intel_dsp_desc tglh_chip_info = {
@@ -191,6 +192,7 @@ const struct sof_intel_dsp_desc tglh_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_2_5,
+       .platform = "tgl",
 };
 
 const struct sof_intel_dsp_desc ehl_chip_info = {
@@ -220,6 +222,7 @@ const struct sof_intel_dsp_desc ehl_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_2_5,
+       .platform = "ehl",
 };
 
 const struct sof_intel_dsp_desc adls_chip_info = {
@@ -249,4 +252,5 @@ const struct sof_intel_dsp_desc adls_chip_info = {
        .power_down_dsp = hda_power_down_dsp,
        .disable_interrupts = hda_dsp_disable_interrupts,
        .hw_ip_version = SOF_INTEL_CAVS_2_5,
+       .platform = "adl",
 };