Skip to content

Commit 215abac

Browse files
committed
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>
1 parent a288192 commit 215abac

9 files changed

Lines changed: 15 additions & 0 deletions

File tree

sound/soc/sof/intel/apl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,5 @@ const struct sof_intel_dsp_desc apl_chip_info = {
118118
.power_down_dsp = hda_power_down_dsp,
119119
.disable_interrupts = hda_dsp_disable_interrupts,
120120
.hw_ip_version = SOF_INTEL_CAVS_1_5_PLUS,
121+
.platform = "apl",
121122
};

sound/soc/sof/intel/cnl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = {
479479
.power_down_dsp = hda_power_down_dsp,
480480
.disable_interrupts = hda_dsp_disable_interrupts,
481481
.hw_ip_version = SOF_INTEL_CAVS_1_8,
482+
.platform = "cnl",
482483
};
483484

484485
/*
@@ -515,5 +516,6 @@ const struct sof_intel_dsp_desc jsl_chip_info = {
515516
.power_down_dsp = hda_power_down_dsp,
516517
.disable_interrupts = hda_dsp_disable_interrupts,
517518
.hw_ip_version = SOF_INTEL_CAVS_2_0,
519+
.platform = "jsl",
518520
};
519521
EXPORT_SYMBOL_NS(jsl_chip_info, "SND_SOC_SOF_INTEL_CNL");

sound/soc/sof/intel/icl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,5 @@ const struct sof_intel_dsp_desc icl_chip_info = {
193193
.power_down_dsp = hda_power_down_dsp,
194194
.disable_interrupts = hda_dsp_disable_interrupts,
195195
.hw_ip_version = SOF_INTEL_CAVS_2_0,
196+
.platform = "icl",
196197
};

sound/soc/sof/intel/lnl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ const struct sof_intel_dsp_desc lnl_chip_info = {
183183
.power_down_dsp = mtl_power_down_dsp,
184184
.disable_interrupts = lnl_dsp_disable_interrupts,
185185
.hw_ip_version = SOF_INTEL_ACE_2_0,
186+
.platform = "lnl",
186187
};
187188

188189
MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_MTL");

sound/soc/sof/intel/mtl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,7 @@ const struct sof_intel_dsp_desc mtl_chip_info = {
789789
.power_down_dsp = mtl_power_down_dsp,
790790
.disable_interrupts = mtl_dsp_disable_interrupts,
791791
.hw_ip_version = SOF_INTEL_ACE_1_0,
792+
.platform = "mtl",
792793
};
793794

794795
const struct sof_intel_dsp_desc arl_s_chip_info = {
@@ -817,4 +818,5 @@ const struct sof_intel_dsp_desc arl_s_chip_info = {
817818
.power_down_dsp = mtl_power_down_dsp,
818819
.disable_interrupts = mtl_dsp_disable_interrupts,
819820
.hw_ip_version = SOF_INTEL_ACE_1_0,
821+
.platform = "arl",
820822
};

sound/soc/sof/intel/ptl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ const struct sof_intel_dsp_desc ptl_chip_info = {
125125
.power_down_dsp = mtl_power_down_dsp,
126126
.disable_interrupts = lnl_dsp_disable_interrupts,
127127
.hw_ip_version = SOF_INTEL_ACE_3_0,
128+
.platform = "ptl",
128129
};
129130

130131
const struct sof_intel_dsp_desc wcl_chip_info = {
@@ -148,6 +149,7 @@ const struct sof_intel_dsp_desc wcl_chip_info = {
148149
.power_down_dsp = mtl_power_down_dsp,
149150
.disable_interrupts = lnl_dsp_disable_interrupts,
150151
.hw_ip_version = SOF_INTEL_ACE_3_0,
152+
.platform = "wcl",
151153
};
152154

153155
MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_MTL");

sound/soc/sof/intel/shim.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ struct sof_intel_dsp_desc {
186186
u32 sdw_alh_base;
187187
u32 d0i3_offset;
188188
u32 quirks;
189+
const char *platform;
189190
enum sof_intel_hw_ip_version hw_ip_version;
190191
int (*read_sdw_lcount)(struct snd_sof_dev *sdev);
191192
void (*enable_sdw_irq)(struct snd_sof_dev *sdev, bool enable);

sound/soc/sof/intel/skl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,6 @@ const struct sof_intel_dsp_desc skl_chip_info = {
113113
.power_down_dsp = hda_power_down_dsp,
114114
.disable_interrupts = hda_dsp_disable_interrupts,
115115
.hw_ip_version = SOF_INTEL_CAVS_1_5,
116+
.platform = "skl",
116117
};
117118
EXPORT_SYMBOL_NS(skl_chip_info, "SND_SOC_SOF_INTEL_HDA_COMMON");

sound/soc/sof/intel/tgl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ const struct sof_intel_dsp_desc tgl_chip_info = {
162162
.power_down_dsp = hda_power_down_dsp,
163163
.disable_interrupts = hda_dsp_disable_interrupts,
164164
.hw_ip_version = SOF_INTEL_CAVS_2_5,
165+
.platform = "tgl",
165166
};
166167

167168
const struct sof_intel_dsp_desc tglh_chip_info = {
@@ -191,6 +192,7 @@ const struct sof_intel_dsp_desc tglh_chip_info = {
191192
.power_down_dsp = hda_power_down_dsp,
192193
.disable_interrupts = hda_dsp_disable_interrupts,
193194
.hw_ip_version = SOF_INTEL_CAVS_2_5,
195+
.platform = "tgl",
194196
};
195197

196198
const struct sof_intel_dsp_desc ehl_chip_info = {
@@ -220,6 +222,7 @@ const struct sof_intel_dsp_desc ehl_chip_info = {
220222
.power_down_dsp = hda_power_down_dsp,
221223
.disable_interrupts = hda_dsp_disable_interrupts,
222224
.hw_ip_version = SOF_INTEL_CAVS_2_5,
225+
.platform = "ehl",
223226
};
224227

225228
const struct sof_intel_dsp_desc adls_chip_info = {
@@ -249,4 +252,5 @@ const struct sof_intel_dsp_desc adls_chip_info = {
249252
.power_down_dsp = hda_power_down_dsp,
250253
.disable_interrupts = hda_dsp_disable_interrupts,
251254
.hw_ip_version = SOF_INTEL_CAVS_2_5,
255+
.platform = "adl",
252256
};

0 commit comments

Comments
 (0)