diff options
Diffstat (limited to 'sound/soc/intel/common/sst-acpi.c')
-rw-r--r-- | sound/soc/intel/common/sst-acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c index 7a85c576dad3..2c5eda14d510 100644 --- a/sound/soc/intel/common/sst-acpi.c +++ b/sound/soc/intel/common/sst-acpi.c | |||
@@ -215,6 +215,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { | |||
215 | .dma_size = SST_LPT_DSP_DMA_SIZE, | 215 | .dma_size = SST_LPT_DSP_DMA_SIZE, |
216 | }; | 216 | }; |
217 | 217 | ||
218 | #if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) | ||
218 | static struct sst_acpi_mach baytrail_machines[] = { | 219 | static struct sst_acpi_mach baytrail_machines[] = { |
219 | { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, | 220 | { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, |
220 | { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, | 221 | { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, |
@@ -231,11 +232,14 @@ static struct sst_acpi_desc sst_acpi_baytrail_desc = { | |||
231 | .sst_id = SST_DEV_ID_BYT, | 232 | .sst_id = SST_DEV_ID_BYT, |
232 | .resindex_dma_base = -1, | 233 | .resindex_dma_base = -1, |
233 | }; | 234 | }; |
235 | #endif | ||
234 | 236 | ||
235 | static const struct acpi_device_id sst_acpi_match[] = { | 237 | static const struct acpi_device_id sst_acpi_match[] = { |
236 | { "INT33C8", (unsigned long)&sst_acpi_haswell_desc }, | 238 | { "INT33C8", (unsigned long)&sst_acpi_haswell_desc }, |
237 | { "INT3438", (unsigned long)&sst_acpi_broadwell_desc }, | 239 | { "INT3438", (unsigned long)&sst_acpi_broadwell_desc }, |
240 | #if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) | ||
238 | { "80860F28", (unsigned long)&sst_acpi_baytrail_desc }, | 241 | { "80860F28", (unsigned long)&sst_acpi_baytrail_desc }, |
242 | #endif | ||
239 | { } | 243 | { } |
240 | }; | 244 | }; |
241 | MODULE_DEVICE_TABLE(acpi, sst_acpi_match); | 245 | MODULE_DEVICE_TABLE(acpi, sst_acpi_match); |