kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
..
..
@@ -1,6 +1,6 @@
1
-// SPDX-License-Identifier: GPL-2.0
1
+// SPDX-License-Identifier: GPL-2.0-only
2
2
 /*
3
- * soc-apci-intel-cnl-match.c - tables and support for CNL ACPI enumeration.
3
+ * soc-acpi-intel-cnl-match.c - tables and support for CNL ACPI enumeration.
4
4
  *
5
5
  * Copyright (c) 2018, Intel Corporation.
6
6
  *
..
..
@@ -20,13 +20,49 @@
20
20
 		.drv_name = "cnl_rt274",
21
21
 		.fw_filename = "intel/dsp_fw_cnl.bin",
22
22
 		.pdata = &cnl_pdata,
23
-		.sof_fw_filename = "intel/sof-cnl.ri",
24
-		.sof_tplg_filename = "intel/sof-cnl-rt274.tplg",
25
-		.asoc_plat_name = "0000:00:1f.3",
23
+		.sof_fw_filename = "sof-cnl.ri",
24
+		.sof_tplg_filename = "sof-cnl-rt274.tplg",
26
25
 	},
27
26
 	{},
28
27
 };
29
28
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_machines);
30
29
 
30
+static const struct snd_soc_acpi_endpoint single_endpoint = {
31
+	.num = 0,
32
+	.aggregated = 0,
33
+	.group_position = 0,
34
+	.group_id = 0,
35
+};
36
+
37
+static const struct snd_soc_acpi_adr_device rt5682_2_adr[] = {
38
+	{
39
+		.adr = 0x000220025D568200,
40
+		.num_endpoints = 1,
41
+		.endpoints = &single_endpoint,
42
+		.name_prefix = "rt5682"
43
+	}
44
+};
45
+
46
+static const struct snd_soc_acpi_link_adr up_extreme_rt5682_2[] = {
47
+	{
48
+		.mask = BIT(2),
49
+		.num_adr = ARRAY_SIZE(rt5682_2_adr),
50
+		.adr_d = rt5682_2_adr,
51
+	},
52
+	{}
53
+};
54
+
55
+struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[] = {
56
+	{
57
+		.link_mask = BIT(2),
58
+		.links = up_extreme_rt5682_2,
59
+		.drv_name = "sof_sdw",
60
+		.sof_fw_filename = "sof-cnl.ri",
61
+		.sof_tplg_filename = "sof-cnl-rt5682-sdw2.tplg"
62
+	},
63
+	{}
64
+};
65
+EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_sdw_machines);
66
+
31
67
 MODULE_LICENSE("GPL v2");
32
68
 MODULE_DESCRIPTION("Intel Common ACPI Match module");