kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/sound/soc/intel/common/soc-acpi-intel-cht-match.c
..
..
@@ -1,17 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
- * soc-apci-intel-cht-match.c - tables and support for CHT ACPI enumeration.
3
+ * soc-acpi-intel-cht-match.c - tables and support for CHT ACPI enumeration.
3
4
  *
4
5
  * Copyright (c) 2017, Intel Corporation.
5
- *
6
- *
7
- * This program is free software; you can redistribute it and/or modify it
8
- * under the terms and conditions of the GNU General Public License,
9
- * version 2, as published by the Free Software Foundation.
10
- *
11
- * This program is distributed in the hope it will be useful, but WITHOUT
12
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
14
- * more details.
15
6
  */
16
7
 
17
8
 #include <linux/dmi.h>
..
..
@@ -44,9 +35,8 @@
44
35
 	.drv_name = "cht-bsw-rt5645",
45
36
 	.fw_filename = "intel/fw_sst_22a8.bin",
46
37
 	.board = "cht-bsw",
47
-	.sof_fw_filename = "intel/sof-cht.ri",
48
-	.sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
49
-	.asoc_plat_name = "sst-mfld-platform",
38
+	.sof_fw_filename = "sof-cht.ri",
39
+	.sof_tplg_filename = "sof-cht-rt5645.tplg",
50
40
 };
51
41
 
52
42
 static struct snd_soc_acpi_mach *cht_quirk(void *arg)
..
..
@@ -68,90 +58,80 @@
68
58
 		.drv_name = "cht-bsw-rt5672",
69
59
 		.fw_filename = "intel/fw_sst_22a8.bin",
70
60
 		.board = "cht-bsw",
71
-		.sof_fw_filename = "intel/sof-cht.ri",
72
-		.sof_tplg_filename = "intel/sof-cht-rt5670.tplg",
73
-		.asoc_plat_name = "sst-mfld-platform",
61
+		.sof_fw_filename = "sof-cht.ri",
62
+		.sof_tplg_filename = "sof-cht-rt5670.tplg",
74
63
 	},
75
64
 	{
76
65
 		.id = "10EC5672",
77
66
 		.drv_name = "cht-bsw-rt5672",
78
67
 		.fw_filename = "intel/fw_sst_22a8.bin",
79
68
 		.board = "cht-bsw",
80
-		.sof_fw_filename = "intel/sof-cht.ri",
81
-		.sof_tplg_filename = "intel/sof-cht-rt5670.tplg",
82
-		.asoc_plat_name = "sst-mfld-platform",
69
+		.sof_fw_filename = "sof-cht.ri",
70
+		.sof_tplg_filename = "sof-cht-rt5670.tplg",
83
71
 	},
84
72
 	{
85
73
 		.id = "10EC5645",
86
74
 		.drv_name = "cht-bsw-rt5645",
87
75
 		.fw_filename = "intel/fw_sst_22a8.bin",
88
76
 		.board = "cht-bsw",
89
-		.sof_fw_filename = "intel/sof-cht.ri",
90
-		.sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
91
-		.asoc_plat_name = "sst-mfld-platform",
77
+		.sof_fw_filename = "sof-cht.ri",
78
+		.sof_tplg_filename = "sof-cht-rt5645.tplg",
92
79
 	},
93
80
 	{
94
81
 		.id = "10EC5650",
95
82
 		.drv_name = "cht-bsw-rt5645",
96
83
 		.fw_filename = "intel/fw_sst_22a8.bin",
97
84
 		.board = "cht-bsw",
98
-		.sof_fw_filename = "intel/sof-cht.ri",
99
-		.sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
100
-		.asoc_plat_name = "sst-mfld-platform",
85
+		.sof_fw_filename = "sof-cht.ri",
86
+		.sof_tplg_filename = "sof-cht-rt5645.tplg",
101
87
 	},
102
88
 	{
103
89
 		.id = "10EC3270",
104
90
 		.drv_name = "cht-bsw-rt5645",
105
91
 		.fw_filename = "intel/fw_sst_22a8.bin",
106
92
 		.board = "cht-bsw",
107
-		.sof_fw_filename = "intel/sof-cht.ri",
108
-		.sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
109
-		.asoc_plat_name = "sst-mfld-platform",
93
+		.sof_fw_filename = "sof-cht.ri",
94
+		.sof_tplg_filename = "sof-cht-rt5645.tplg",
110
95
 	},
111
96
 	{
112
97
 		.id = "193C9890",
113
98
 		.drv_name = "cht-bsw-max98090",
114
99
 		.fw_filename = "intel/fw_sst_22a8.bin",
115
100
 		.board = "cht-bsw",
116
-		.sof_fw_filename = "intel/sof-cht.ri",
117
-		.sof_tplg_filename = "intel/sof-cht-max98090.tplg",
118
-		.asoc_plat_name = "sst-mfld-platform",
101
+		.sof_fw_filename = "sof-cht.ri",
102
+		.sof_tplg_filename = "sof-cht-max98090.tplg",
119
103
 	},
120
104
 	{
121
105
 		.id = "10508824",
122
106
 		.drv_name = "cht-bsw-nau8824",
123
107
 		.fw_filename = "intel/fw_sst_22a8.bin",
124
108
 		.board = "cht-bsw",
125
-		.sof_fw_filename = "intel/sof-cht.ri",
126
-		.sof_tplg_filename = "intel/sof-cht-nau8824.tplg",
127
-		.asoc_plat_name = "sst-mfld-platform",
109
+		.sof_fw_filename = "sof-cht.ri",
110
+		.sof_tplg_filename = "sof-cht-nau8824.tplg",
128
111
 	},
129
112
 	{
130
113
 		.id = "DLGS7212",
131
114
 		.drv_name = "bytcht_da7213",
132
115
 		.fw_filename = "intel/fw_sst_22a8.bin",
133
116
 		.board = "bytcht_da7213",
134
-		.sof_fw_filename = "intel/sof-cht.ri",
135
-		.sof_tplg_filename = "intel/sof-cht-da7213.tplg",
136
-		.asoc_plat_name = "sst-mfld-platform",
117
+		.sof_fw_filename = "sof-cht.ri",
118
+		.sof_tplg_filename = "sof-cht-da7213.tplg",
137
119
 	},
138
120
 	{
139
121
 		.id = "DLGS7213",
140
122
 		.drv_name = "bytcht_da7213",
141
123
 		.fw_filename = "intel/fw_sst_22a8.bin",
142
124
 		.board = "bytcht_da7213",
143
-		.sof_fw_filename = "intel/sof-cht.ri",
144
-		.sof_tplg_filename = "intel/sof-cht-da7213.tplg",
145
-		.asoc_plat_name = "sst-mfld-platform",
125
+		.sof_fw_filename = "sof-cht.ri",
126
+		.sof_tplg_filename = "sof-cht-da7213.tplg",
146
127
 	},
147
128
 	{
148
129
 		.id = "ESSX8316",
149
130
 		.drv_name = "bytcht_es8316",
150
131
 		.fw_filename = "intel/fw_sst_22a8.bin",
151
132
 		.board = "bytcht_es8316",
152
-		.sof_fw_filename = "intel/sof-cht.ri",
153
-		.sof_tplg_filename = "intel/sof-cht-es8316.tplg",
154
-		.asoc_plat_name = "sst-mfld-platform",
133
+		.sof_fw_filename = "sof-cht.ri",
134
+		.sof_tplg_filename = "sof-cht-es8316.tplg",
155
135
 	},
156
136
 	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
157
137
 	{
..
..
@@ -160,18 +140,22 @@
160
140
 		.fw_filename = "intel/fw_sst_22a8.bin",
161
141
 		.board = "bytcr_rt5640",
162
142
 		.machine_quirk = cht_quirk,
163
-		.sof_fw_filename = "intel/sof-cht.ri",
164
-		.sof_tplg_filename = "intel/sof-cht-rt5640.tplg",
165
-		.asoc_plat_name = "sst-mfld-platform",
143
+		.sof_fw_filename = "sof-cht.ri",
144
+		.sof_tplg_filename = "sof-cht-rt5640.tplg",
166
145
 	},
167
146
 	{
168
147
 		.id = "10EC3276",
169
148
 		.drv_name = "bytcr_rt5640",
170
149
 		.fw_filename = "intel/fw_sst_22a8.bin",
171
150
 		.board = "bytcr_rt5640",
172
-		.sof_fw_filename = "intel/sof-cht.ri",
173
-		.sof_tplg_filename = "intel/sof-cht-rt5640.tplg",
174
-		.asoc_plat_name = "sst-mfld-platform",
151
+		.sof_fw_filename = "sof-cht.ri",
152
+		.sof_tplg_filename = "sof-cht-rt5640.tplg",
153
+	},
154
+	{
155
+		.id = "10EC5682",
156
+		.drv_name = "sof_rt5682",
157
+		.sof_fw_filename = "sof-cht.ri",
158
+		.sof_tplg_filename = "sof-cht-rt5682.tplg",
175
159
 	},
176
160
 	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
177
161
 	{
..
..
@@ -179,10 +163,24 @@
179
163
 		.drv_name = "bytcr_rt5651",
180
164
 		.fw_filename = "intel/fw_sst_22a8.bin",
181
165
 		.board = "bytcr_rt5651",
182
-		.sof_fw_filename = "intel/sof-cht.ri",
183
-		.sof_tplg_filename = "intel/sof-cht-rt5651.tplg",
184
-		.asoc_plat_name = "sst-mfld-platform",
166
+		.sof_fw_filename = "sof-cht.ri",
167
+		.sof_tplg_filename = "sof-cht-rt5651.tplg",
185
168
 	},
169
+	{
170
+		.id = "14F10720",
171
+		.drv_name = "bytcht_cx2072x",
172
+		.fw_filename = "intel/fw_sst_22a8.bin",
173
+		.board = "bytcht_cx2072x",
174
+		.sof_fw_filename = "sof-cht.ri",
175
+		.sof_tplg_filename = "sof-cht-cx2072x.tplg",
176
+	},
177
+	{
178
+		.id = "104C5122",
179
+		.drv_name = "sof_pcm512x",
180
+		.sof_fw_filename = "sof-cht.ri",
181
+		.sof_tplg_filename = "sof-cht-src-50khz-pcm512x.tplg",
182
+	},
183
+
186
184
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
187
185
 	/*
188
186
 	 * This is always last in the table so that it is selected only when