tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Intel: acpi-match: split CNL tables in three
Due to firmware manifest/signature differences, we have to use
different firmware names, so split CNL machine table in three (CNL,
CFL, CML).
The CFL table is currently empty since all known platforms use
HDaudio, but let's plan ahead.
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191111222901.19892-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Pierre-Louis Bossart
and committed by
Mark Brown
1f24d93c
13409d27
+78
-39
+2
include/sound/soc-acpi-intel-match.h
+2
include/sound/soc-acpi-intel-match.h
···
24
24
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[];
25
25
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[];
26
26
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[];
27
+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_machines[];
28
+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[];
27
29
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[];
28
30
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[];
29
31
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[];
+2
-1
sound/soc/intel/common/Makefile
+2
-1
sound/soc/intel/common/Makefile
···
7
7
soc-acpi-intel-hsw-bdw-match.o \
8
8
soc-acpi-intel-skl-match.o soc-acpi-intel-kbl-match.o \
9
9
soc-acpi-intel-bxt-match.o soc-acpi-intel-glk-match.o \
10
-
soc-acpi-intel-cnl-match.o soc-acpi-intel-icl-match.o \
10
+
soc-acpi-intel-cnl-match.o soc-acpi-intel-cfl-match.o \
11
+
soc-acpi-intel-cml-match.o soc-acpi-intel-icl-match.o \
11
12
soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \
12
13
soc-acpi-intel-jsl-match.o \
13
14
soc-acpi-intel-hda-match.o
+18
sound/soc/intel/common/soc-acpi-intel-cfl-match.c
+18
sound/soc/intel/common/soc-acpi-intel-cfl-match.c
···
1
+
// SPDX-License-Identifier: GPL-2.0
2
+
/*
3
+
* soc-apci-intel-cfl-match.c - tables and support for CFL ACPI enumeration.
4
+
*
5
+
* Copyright (c) 2019, Intel Corporation.
6
+
*
7
+
*/
8
+
9
+
#include <sound/soc-acpi.h>
10
+
#include <sound/soc-acpi-intel-match.h>
11
+
12
+
struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_machines[] = {
13
+
{},
14
+
};
15
+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cfl_machines);
16
+
17
+
MODULE_LICENSE("GPL v2");
18
+
MODULE_DESCRIPTION("Intel Common ACPI Match module");
+56
sound/soc/intel/common/soc-acpi-intel-cml-match.c
+56
sound/soc/intel/common/soc-acpi-intel-cml-match.c
···
1
+
// SPDX-License-Identifier: GPL-2.0
2
+
/*
3
+
* soc-acpi-intel-cml-match.c - tables and support for CML ACPI enumeration.
4
+
*
5
+
* Copyright (c) 2019, Intel Corporation.
6
+
*
7
+
*/
8
+
9
+
#include <sound/soc-acpi.h>
10
+
#include <sound/soc-acpi-intel-match.h>
11
+
12
+
static struct snd_soc_acpi_codecs cml_codecs = {
13
+
.num_codecs = 1,
14
+
.codecs = {"10EC5682"}
15
+
};
16
+
17
+
static struct snd_soc_acpi_codecs cml_spk_codecs = {
18
+
.num_codecs = 1,
19
+
.codecs = {"MX98357A"}
20
+
};
21
+
22
+
struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
23
+
{
24
+
.id = "DLGS7219",
25
+
.drv_name = "cml_da7219_max98357a",
26
+
.quirk_data = &cml_spk_codecs,
27
+
.sof_fw_filename = "sof-cml.ri",
28
+
.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
29
+
},
30
+
{
31
+
.id = "MX98357A",
32
+
.drv_name = "sof_rt5682",
33
+
.quirk_data = &cml_codecs,
34
+
.sof_fw_filename = "sof-cml.ri",
35
+
.sof_tplg_filename = "sof-cml-rt5682-max98357a.tplg",
36
+
},
37
+
{
38
+
.id = "10EC1011",
39
+
.drv_name = "cml_rt1011_rt5682",
40
+
.quirk_data = &cml_codecs,
41
+
.sof_fw_filename = "sof-cml.ri",
42
+
.sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",
43
+
},
44
+
{
45
+
.id = "10EC5682",
46
+
.drv_name = "sof_rt5682",
47
+
.sof_fw_filename = "sof-cml.ri",
48
+
.sof_tplg_filename = "sof-cml-rt5682.tplg",
49
+
},
50
+
51
+
{},
52
+
};
53
+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cml_machines);
54
+
55
+
MODULE_LICENSE("GPL v2");
56
+
MODULE_DESCRIPTION("Intel Common ACPI Match module");
-38
sound/soc/intel/common/soc-acpi-intel-cnl-match.c
-38
sound/soc/intel/common/soc-acpi-intel-cnl-match.c
···
14
14
.use_tplg_pcm = true,
15
15
};
16
16
17
-
static struct snd_soc_acpi_codecs cml_codecs = {
18
-
.num_codecs = 1,
19
-
.codecs = {"10EC5682"}
20
-
};
21
-
22
-
static struct snd_soc_acpi_codecs cml_spk_codecs = {
23
-
.num_codecs = 1,
24
-
.codecs = {"MX98357A"}
25
-
};
26
-
27
17
struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
28
18
{
29
19
.id = "INT34C2",
···
23
33
.sof_fw_filename = "sof-cnl.ri",
24
34
.sof_tplg_filename = "sof-cnl-rt274.tplg",
25
35
},
26
-
{
27
-
.id = "DLGS7219",
28
-
.drv_name = "cml_da7219_max98357a",
29
-
.quirk_data = &cml_spk_codecs,
30
-
.sof_fw_filename = "sof-cnl.ri",
31
-
.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
32
-
},
33
-
{
34
-
.id = "MX98357A",
35
-
.drv_name = "sof_rt5682",
36
-
.quirk_data = &cml_codecs,
37
-
.sof_fw_filename = "sof-cnl.ri",
38
-
.sof_tplg_filename = "sof-cml-rt5682-max98357a.tplg",
39
-
},
40
-
{
41
-
.id = "10EC1011",
42
-
.drv_name = "cml_rt1011_rt5682",
43
-
.quirk_data = &cml_codecs,
44
-
.sof_fw_filename = "sof-cnl.ri",
45
-
.sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",
46
-
},
47
-
{
48
-
.id = "10EC5682",
49
-
.drv_name = "sof_rt5682",
50
-
.sof_fw_filename = "sof-cnl.ri",
51
-
.sof_tplg_filename = "sof-cml-rt5682.tplg",
52
-
},
53
-
54
36
{},
55
37
};
56
38
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_machines);