summaryrefslogtreecommitdiff
path: root/sound/soc/intel/common
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-08-16 19:33:11 +0300
committerMark Brown <broonie@kernel.org>2022-08-16 19:33:11 +0300
commit6256547352fa21356de8d26b058e50d719ecc0d2 (patch)
treefa68af9b93305812c70fdae2e9307e30cb780f51 /sound/soc/intel/common
parent63d375b9f2a99bb111e3fb5f3e2442a391988949 (diff)
parenta25e1183ea2d0feb068794adf0249919ea7e0d8c (diff)
downloadlinux-6256547352fa21356de8d26b058e50d719ecc0d2.tar.xz
ASoC: Intel: HSW and BDW updates
Merge series from Cezary Rojewski <cezary.rojewski@intel.com>: Sharing this PR as it touches on cross-driver subjects. Four commits yet two subject. Given the small delta, decided to combine within single PR here.
Diffstat (limited to 'sound/soc/intel/common')
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
index cbcb649604e5..6daf60b1edf1 100644
--- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
@@ -9,40 +9,25 @@
#include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.h>
-struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[] = {
- {
- .id = "INT33CA",
- .drv_name = "hsw_rt5640",
- .fw_filename = "intel/IntcSST1.bin",
- .sof_tplg_filename = "sof-hsw.tplg",
- },
- {}
-};
-EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_haswell_machines);
-
struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = {
{
.id = "INT343A",
.drv_name = "bdw_rt286",
- .fw_filename = "intel/IntcSST2.bin",
.sof_tplg_filename = "sof-bdw-rt286.tplg",
},
{
.id = "10EC5650",
.drv_name = "bdw-rt5650",
- .fw_filename = "intel/IntcSST2.bin",
.sof_tplg_filename = "sof-bdw-rt5650.tplg",
},
{
.id = "RT5677CE",
.drv_name = "bdw-rt5677",
- .fw_filename = "intel/IntcSST2.bin",
.sof_tplg_filename = "sof-bdw-rt5677.tplg",
},
{
.id = "INT33CA",
.drv_name = "hsw_rt5640",
- .fw_filename = "intel/IntcSST2.bin",
.sof_tplg_filename = "sof-bdw-rt5640.tplg",
},
{}