Skip to content

Commit cbaa7f0

Browse files
plbossartbroonie
plbossart
authored and
broonie
committed
ASoC: Intel: move SKL+ codec ACPI tables to common directory
No functionality change, just move to common tables to make it easier to deal with SOF and share the same machine drivers - as done previously for BYT/CHT/HSW/BDW. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 5f15f26 commit cbaa7f0

File tree

8 files changed

+241
-157
lines changed

8 files changed

+241
-157
lines changed

‎include/sound/soc-acpi-intel-match.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,10 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[];
2929
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[];
3030
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[];
3131
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];
32+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[];
33+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[];
34+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[];
35+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[];
36+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[];
3237

3338
#endif

‎sound/soc/intel/common/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ snd-soc-sst-dsp-objs := sst-dsp.o
33
snd-soc-sst-acpi-objs := sst-acpi.o
44
snd-soc-sst-ipc-objs := sst-ipc.o
55
snd-soc-sst-firmware-objs := sst-firmware.o
6-
snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o soc-acpi-intel-hsw-bdw-match.o
6+
snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o \
7+
soc-acpi-intel-hsw-bdw-match.o \
8+
soc-acpi-intel-skl-match.o soc-acpi-intel-kbl-match.o \
9+
soc-acpi-intel-bxt-match.o soc-acpi-intel-glk-match.o \
10+
soc-acpi-intel-cnl-match.o
711

812
obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
913
obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o

‎sound/soc/intel/common/soc-acpi-intel-bxt-match.c‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* soc-apci-intel-bxt-match.c - tables and support for BXT ACPI enumeration.
4+
*
5+
* Copyright (c) 2018, 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 bxt_codecs = {
13+
.num_codecs = 1,
14+
.codecs = {"MX98357A"}
15+
};
16+
17+
struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
18+
{
19+
.id = "INT343A",
20+
.drv_name = "bxt_alc298s_i2s",
21+
.fw_filename = "intel/dsp_fw_bxtn.bin",
22+
},
23+
{
24+
.id = "DLGS7219",
25+
.drv_name = "bxt_da7219_max98357a",
26+
.fw_filename = "intel/dsp_fw_bxtn.bin",
27+
.machine_quirk = snd_soc_acpi_codec_list,
28+
.quirk_data = &bxt_codecs,
29+
},
30+
{},
31+
};
32+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_bxt_machines);
33+
34+
MODULE_LICENSE("GPL v2");
35+
MODULE_DESCRIPTION("Intel Common ACPI Match module");

‎sound/soc/intel/common/soc-acpi-intel-cnl-match.c‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* soc-apci-intel-cnl-match.c - tables and support for CNL ACPI enumeration.
4+
*
5+
* Copyright (c) 2018, Intel Corporation.
6+
*
7+
*/
8+
9+
#include <sound/soc-acpi.h>
10+
#include <sound/soc-acpi-intel-match.h>
11+
#include "../skylake/skl.h"
12+
13+
static struct skl_machine_pdata cnl_pdata = {
14+
.use_tplg_pcm = true,
15+
};
16+
17+
struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
18+
{
19+
.id = "INT34C2",
20+
.drv_name = "cnl_rt274",
21+
.fw_filename = "intel/dsp_fw_cnl.bin",
22+
.pdata = &cnl_pdata,
23+
},
24+
{},
25+
};
26+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_machines);
27+
28+
MODULE_LICENSE("GPL v2");
29+
MODULE_DESCRIPTION("Intel Common ACPI Match module");

‎sound/soc/intel/common/soc-acpi-intel-glk-match.c‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* soc-apci-intel-glk-match.c - tables and support for GLK ACPI enumeration.
4+
*
5+
* Copyright (c) 2018, 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_glk_machines[] = {
13+
{
14+
.id = "INT343A",
15+
.drv_name = "glk_alc298s_i2s",
16+
.fw_filename = "intel/dsp_fw_glk.bin",
17+
},
18+
{},
19+
};
20+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_glk_machines);
21+
22+
MODULE_LICENSE("GPL v2");
23+
MODULE_DESCRIPTION("Intel Common ACPI Match module");

‎sound/soc/intel/common/soc-acpi-intel-kbl-match.c‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* soc-apci-intel-kbl-match.c - tables and support for KBL ACPI enumeration.
4+
*
5+
* Copyright (c) 2018, Intel Corporation.
6+
*
7+
*/
8+
9+
#include <sound/soc-acpi.h>
10+
#include <sound/soc-acpi-intel-match.h>
11+
#include "../skylake/skl.h"
12+
13+
static struct skl_machine_pdata skl_dmic_data;
14+
15+
static struct snd_soc_acpi_codecs kbl_codecs = {
16+
.num_codecs = 1,
17+
.codecs = {"10508825"}
18+
};
19+
20+
static struct snd_soc_acpi_codecs kbl_poppy_codecs = {
21+
.num_codecs = 1,
22+
.codecs = {"10EC5663"}
23+
};
24+
25+
static struct snd_soc_acpi_codecs kbl_5663_5514_codecs = {
26+
.num_codecs = 2,
27+
.codecs = {"10EC5663", "10EC5514"}
28+
};
29+
30+
static struct snd_soc_acpi_codecs kbl_7219_98357_codecs = {
31+
.num_codecs = 1,
32+
.codecs = {"MX98357A"}
33+
};
34+
35+
struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
36+
{
37+
.id = "INT343A",
38+
.drv_name = "kbl_alc286s_i2s",
39+
.fw_filename = "intel/dsp_fw_kbl.bin",
40+
},
41+
{
42+
.id = "INT343B",
43+
.drv_name = "kbl_n88l25_s4567",
44+
.fw_filename = "intel/dsp_fw_kbl.bin",
45+
.machine_quirk = snd_soc_acpi_codec_list,
46+
.quirk_data = &kbl_codecs,
47+
.pdata = &skl_dmic_data,
48+
},
49+
{
50+
.id = "MX98357A",
51+
.drv_name = "kbl_n88l25_m98357a",
52+
.fw_filename = "intel/dsp_fw_kbl.bin",
53+
.machine_quirk = snd_soc_acpi_codec_list,
54+
.quirk_data = &kbl_codecs,
55+
.pdata = &skl_dmic_data,
56+
},
57+
{
58+
.id = "MX98927",
59+
.drv_name = "kbl_r5514_5663_max",
60+
.fw_filename = "intel/dsp_fw_kbl.bin",
61+
.machine_quirk = snd_soc_acpi_codec_list,
62+
.quirk_data = &kbl_5663_5514_codecs,
63+
.pdata = &skl_dmic_data,
64+
},
65+
{
66+
.id = "MX98927",
67+
.drv_name = "kbl_rt5663_m98927",
68+
.fw_filename = "intel/dsp_fw_kbl.bin",
69+
.machine_quirk = snd_soc_acpi_codec_list,
70+
.quirk_data = &kbl_poppy_codecs,
71+
.pdata = &skl_dmic_data,
72+
},
73+
{
74+
.id = "10EC5663",
75+
.drv_name = "kbl_rt5663",
76+
.fw_filename = "intel/dsp_fw_kbl.bin",
77+
},
78+
{
79+
.id = "DLGS7219",
80+
.drv_name = "kbl_da7219_max98357a",
81+
.fw_filename = "intel/dsp_fw_kbl.bin",
82+
.machine_quirk = snd_soc_acpi_codec_list,
83+
.quirk_data = &kbl_7219_98357_codecs,
84+
.pdata = &skl_dmic_data,
85+
},
86+
{},
87+
};
88+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_kbl_machines);
89+
90+
MODULE_LICENSE("GPL v2");
91+
MODULE_DESCRIPTION("Intel Common ACPI Match module");

‎sound/soc/intel/common/soc-acpi-intel-skl-match.c‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* soc-apci-intel-skl-match.c - tables and support for SKL ACPI enumeration.
4+
*
5+
* Copyright (c) 2018, Intel Corporation.
6+
*
7+
*/
8+
9+
#include <sound/soc-acpi.h>
10+
#include <sound/soc-acpi-intel-match.h>
11+
#include "../skylake/skl.h"
12+
13+
static struct skl_machine_pdata skl_dmic_data;
14+
15+
static struct snd_soc_acpi_codecs skl_codecs = {
16+
.num_codecs = 1,
17+
.codecs = {"10508825"}
18+
};
19+
20+
struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[] = {
21+
{
22+
.id = "INT343A",
23+
.drv_name = "skl_alc286s_i2s",
24+
.fw_filename = "intel/dsp_fw_release.bin",
25+
},
26+
{
27+
.id = "INT343B",
28+
.drv_name = "skl_n88l25_s4567",
29+
.fw_filename = "intel/dsp_fw_release.bin",
30+
.machine_quirk = snd_soc_acpi_codec_list,
31+
.quirk_data = &skl_codecs,
32+
.pdata = &skl_dmic_data,
33+
},
34+
{
35+
.id = "MX98357A",
36+
.drv_name = "skl_n88l25_m98357a",
37+
.fw_filename = "intel/dsp_fw_release.bin",
38+
.machine_quirk = snd_soc_acpi_codec_list,
39+
.quirk_data = &skl_codecs,
40+
.pdata = &skl_dmic_data,
41+
},
42+
{},
43+
};
44+
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_skl_machines);
45+
46+
MODULE_LICENSE("GPL v2");
47+
MODULE_DESCRIPTION("Intel Common ACPI Match module");

0 commit comments

Comments
 (0)