Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts
This adds some match entries for a few system configurations:
cs42l43 link 0 UID 0
cs35l56 link 1 UID 0
cs35l56 link 1 UID 1
cs35l56 link 1 UID 2
cs35l56 link 1 UID 3
cs42l45 link 1 UID 0
cs35l63 link 0 UID 0
cs35l63 link 0 UID 2
cs35l63 link 0 UID 4
cs35l63 link 0 UID 6
cs42l45 link 0 UID 0
cs35l63 link 1 UID 0
cs35l63 link 1 UID 1
cs42l45 link 0 UID 0
cs35l63 link 1 UID 1
cs35l63 link 1 UID 3
cs42l45 link 1 UID 0
cs35l63 link 0 UID 0
cs35l63 link 0 UID 1
cs42l43 link 1 UID 0
cs35l56 link 1 UID 0
cs35l56 link 1 UID 1
cs35l56 link 1 UID 2
cs35l56 link 1 UID 3
cs35l56 link 1 UID 0
cs35l56 link 1 UID 1
cs35l56 link 1 UID 2
cs35l56 link 1 UID 3
cs35l63 link 0 UID 0
cs35l63 link 0 UID 2
cs35l63 link 0 UID 4
cs35l63 link 0 UID 6
cs42l43 link 0 UID 1
cs42l43b link 0 UID 1
cs42l45 link 0 UID 0
cs42l45 link 1 UID 0
Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20260224130307.526626-1-simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Simon Trimmer
and committed by
Mark Brown
fd13fc70
70eddf6a
+413
+413
sound/soc/amd/acp/amd-acp63-acpi-match.c
+413
sound/soc/amd/acp/amd-acp63-acpi-match.c
···
30
30
.group_id = 1
31
31
};
32
32
33
+
static const struct snd_soc_acpi_endpoint spk_2_endpoint = {
34
+
.num = 0,
35
+
.aggregated = 1,
36
+
.group_position = 2,
37
+
.group_id = 1
38
+
};
39
+
40
+
static const struct snd_soc_acpi_endpoint spk_3_endpoint = {
41
+
.num = 0,
42
+
.aggregated = 1,
43
+
.group_position = 3,
44
+
.group_id = 1
45
+
};
46
+
33
47
static const struct snd_soc_acpi_adr_device rt711_rt1316_group_adr[] = {
34
48
{
35
49
.adr = 0x000030025D071101ull,
···
117
103
}
118
104
};
119
105
106
+
static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
107
+
{ /* Jack Playback Endpoint */
108
+
.num = 0,
109
+
.aggregated = 0,
110
+
.group_position = 0,
111
+
.group_id = 0,
112
+
},
113
+
{ /* DMIC Capture Endpoint */
114
+
.num = 1,
115
+
.aggregated = 0,
116
+
.group_position = 0,
117
+
.group_id = 0,
118
+
},
119
+
{ /* Jack Capture Endpoint */
120
+
.num = 2,
121
+
.aggregated = 0,
122
+
.group_position = 0,
123
+
.group_id = 0,
124
+
},
125
+
{ /* Speaker Playback Endpoint */
126
+
.num = 3,
127
+
.aggregated = 0,
128
+
.group_position = 0,
129
+
.group_id = 0,
130
+
},
131
+
};
132
+
133
+
static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = {
134
+
{
135
+
.adr = 0x00013301FA355601ull,
136
+
.num_endpoints = 1,
137
+
.endpoints = &spk_l_endpoint,
138
+
.name_prefix = "AMP1"
139
+
},
140
+
{
141
+
.adr = 0x00013201FA355601ull,
142
+
.num_endpoints = 1,
143
+
.endpoints = &spk_r_endpoint,
144
+
.name_prefix = "AMP2"
145
+
},
146
+
{
147
+
.adr = 0x00013101FA355601ull,
148
+
.num_endpoints = 1,
149
+
.endpoints = &spk_2_endpoint,
150
+
.name_prefix = "AMP3"
151
+
},
152
+
{
153
+
.adr = 0x00013001FA355601ull,
154
+
.num_endpoints = 1,
155
+
.endpoints = &spk_3_endpoint,
156
+
.name_prefix = "AMP4"
157
+
},
158
+
};
159
+
160
+
static const struct snd_soc_acpi_adr_device cs35l63x2_l0u01_adr[] = {
161
+
{
162
+
.adr = 0x00003001FA356301ull,
163
+
.num_endpoints = 1,
164
+
.endpoints = &spk_l_endpoint,
165
+
.name_prefix = "AMP1"
166
+
},
167
+
{
168
+
.adr = 0x00003101FA356301ull,
169
+
.num_endpoints = 1,
170
+
.endpoints = &spk_r_endpoint,
171
+
.name_prefix = "AMP2"
172
+
},
173
+
};
174
+
175
+
static const struct snd_soc_acpi_adr_device cs35l63x2_l1u01_adr[] = {
176
+
{
177
+
.adr = 0x00013001FA356301ull,
178
+
.num_endpoints = 1,
179
+
.endpoints = &spk_l_endpoint,
180
+
.name_prefix = "AMP1"
181
+
},
182
+
{
183
+
.adr = 0x00013101FA356301ull,
184
+
.num_endpoints = 1,
185
+
.endpoints = &spk_r_endpoint,
186
+
.name_prefix = "AMP2"
187
+
},
188
+
};
189
+
190
+
static const struct snd_soc_acpi_adr_device cs35l63x2_l1u13_adr[] = {
191
+
{
192
+
.adr = 0x00013101FA356301ull,
193
+
.num_endpoints = 1,
194
+
.endpoints = &spk_l_endpoint,
195
+
.name_prefix = "AMP1"
196
+
},
197
+
{
198
+
.adr = 0x00013301FA356301ull,
199
+
.num_endpoints = 1,
200
+
.endpoints = &spk_r_endpoint,
201
+
.name_prefix = "AMP2"
202
+
},
203
+
};
204
+
205
+
static const struct snd_soc_acpi_adr_device cs35l63x4_l0u0246_adr[] = {
206
+
{
207
+
.adr = 0x00003001FA356301ull,
208
+
.num_endpoints = 1,
209
+
.endpoints = &spk_l_endpoint,
210
+
.name_prefix = "AMP1"
211
+
},
212
+
{
213
+
.adr = 0x00003201FA356301ull,
214
+
.num_endpoints = 1,
215
+
.endpoints = &spk_r_endpoint,
216
+
.name_prefix = "AMP2"
217
+
},
218
+
{
219
+
.adr = 0x00003401FA356301ull,
220
+
.num_endpoints = 1,
221
+
.endpoints = &spk_2_endpoint,
222
+
.name_prefix = "AMP3"
223
+
},
224
+
{
225
+
.adr = 0x00003601FA356301ull,
226
+
.num_endpoints = 1,
227
+
.endpoints = &spk_3_endpoint,
228
+
.name_prefix = "AMP4"
229
+
},
230
+
};
231
+
232
+
static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = {
233
+
{
234
+
.adr = 0x00003001FA424301ull,
235
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
236
+
.endpoints = cs42l43_endpoints,
237
+
.name_prefix = "cs42l43"
238
+
}
239
+
};
240
+
241
+
static const struct snd_soc_acpi_adr_device cs42l43_l0u1_adr[] = {
242
+
{
243
+
.adr = 0x00003101FA424301ull,
244
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
245
+
.endpoints = cs42l43_endpoints,
246
+
.name_prefix = "cs42l43"
247
+
}
248
+
};
249
+
250
+
static const struct snd_soc_acpi_adr_device cs42l43b_l0u1_adr[] = {
251
+
{
252
+
.adr = 0x00003101FA2A3B01ull,
253
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
254
+
.endpoints = cs42l43_endpoints,
255
+
.name_prefix = "cs42l43"
256
+
}
257
+
};
258
+
259
+
static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_adr[] = {
260
+
{
261
+
.adr = 0x00013001FA424301ull,
262
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
263
+
.endpoints = cs42l43_endpoints,
264
+
.name_prefix = "cs42l43"
265
+
},
266
+
{
267
+
.adr = 0x00013001FA355601ull,
268
+
.num_endpoints = 1,
269
+
.endpoints = &spk_l_endpoint,
270
+
.name_prefix = "AMP1"
271
+
},
272
+
{
273
+
.adr = 0x00013101FA355601ull,
274
+
.num_endpoints = 1,
275
+
.endpoints = &spk_r_endpoint,
276
+
.name_prefix = "AMP2"
277
+
},
278
+
{
279
+
.adr = 0x00013201FA355601ull,
280
+
.num_endpoints = 1,
281
+
.endpoints = &spk_2_endpoint,
282
+
.name_prefix = "AMP3"
283
+
},
284
+
{
285
+
.adr = 0x00013301FA355601ull,
286
+
.num_endpoints = 1,
287
+
.endpoints = &spk_3_endpoint,
288
+
.name_prefix = "AMP4"
289
+
},
290
+
};
291
+
292
+
static const struct snd_soc_acpi_adr_device cs42l45_l0u0_adr[] = {
293
+
{
294
+
.adr = 0x00003001FA424501ull,
295
+
/* Re-use endpoints, but cs42l45 has no speaker */
296
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints) - 1,
297
+
.endpoints = cs42l43_endpoints,
298
+
.name_prefix = "cs42l45"
299
+
}
300
+
};
301
+
302
+
static const struct snd_soc_acpi_adr_device cs42l45_l1u0_adr[] = {
303
+
{
304
+
.adr = 0x00013001FA424501ull,
305
+
/* Re-use endpoints, but cs42l45 has no speaker */
306
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints) - 1,
307
+
.endpoints = cs42l43_endpoints,
308
+
.name_prefix = "cs42l45"
309
+
}
310
+
};
311
+
312
+
static const struct snd_soc_acpi_link_adr acp63_cs35l56x4_l1u3210[] = {
313
+
{
314
+
.mask = BIT(1),
315
+
.num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
316
+
.adr_d = cs35l56x4_l1u3210_adr,
317
+
},
318
+
{}
319
+
};
320
+
321
+
static const struct snd_soc_acpi_link_adr acp63_cs35l63x4_l0u0246[] = {
322
+
{
323
+
.mask = BIT(0),
324
+
.num_adr = ARRAY_SIZE(cs35l63x4_l0u0246_adr),
325
+
.adr_d = cs35l63x4_l0u0246_adr,
326
+
},
327
+
{}
328
+
};
329
+
330
+
static const struct snd_soc_acpi_link_adr acp63_cs42l43_l0u1[] = {
331
+
{
332
+
.mask = BIT(0),
333
+
.num_adr = ARRAY_SIZE(cs42l43_l0u1_adr),
334
+
.adr_d = cs42l43_l0u1_adr,
335
+
},
336
+
{}
337
+
};
338
+
339
+
static const struct snd_soc_acpi_link_adr acp63_cs42l43b_l0u1[] = {
340
+
{
341
+
.mask = BIT(0),
342
+
.num_adr = ARRAY_SIZE(cs42l43b_l0u1_adr),
343
+
.adr_d = cs42l43b_l0u1_adr,
344
+
},
345
+
{}
346
+
};
347
+
348
+
static const struct snd_soc_acpi_link_adr acp63_cs42l43_l0u0_cs35l56x4_l1u3210[] = {
349
+
{
350
+
.mask = BIT(0),
351
+
.num_adr = ARRAY_SIZE(cs42l43_l0u0_adr),
352
+
.adr_d = cs42l43_l0u0_adr,
353
+
},
354
+
{
355
+
.mask = BIT(1),
356
+
.num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
357
+
.adr_d = cs35l56x4_l1u3210_adr,
358
+
},
359
+
{}
360
+
};
361
+
362
+
static const struct snd_soc_acpi_link_adr acp63_cs42l43_l1u0_cs35l56x4_l1u0123[] = {
363
+
{
364
+
.mask = BIT(1),
365
+
.num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),
366
+
.adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,
367
+
},
368
+
{}
369
+
};
370
+
371
+
static const struct snd_soc_acpi_link_adr acp63_cs42l45_l0u0[] = {
372
+
{
373
+
.mask = BIT(0),
374
+
.num_adr = ARRAY_SIZE(cs42l45_l0u0_adr),
375
+
.adr_d = cs42l45_l0u0_adr,
376
+
},
377
+
{}
378
+
};
379
+
380
+
static const struct snd_soc_acpi_link_adr acp63_cs42l45_l0u0_cs35l63x2_l1u01[] = {
381
+
{
382
+
.mask = BIT(0),
383
+
.num_adr = ARRAY_SIZE(cs42l45_l0u0_adr),
384
+
.adr_d = cs42l45_l0u0_adr,
385
+
},
386
+
{
387
+
.mask = BIT(1),
388
+
.num_adr = ARRAY_SIZE(cs35l63x2_l1u01_adr),
389
+
.adr_d = cs35l63x2_l1u01_adr,
390
+
},
391
+
{}
392
+
};
393
+
394
+
static const struct snd_soc_acpi_link_adr acp63_cs42l45_l0u0_cs35l63x2_l1u13[] = {
395
+
{
396
+
.mask = BIT(0),
397
+
.num_adr = ARRAY_SIZE(cs42l45_l0u0_adr),
398
+
.adr_d = cs42l45_l0u0_adr,
399
+
},
400
+
{
401
+
.mask = BIT(1),
402
+
.num_adr = ARRAY_SIZE(cs35l63x2_l1u13_adr),
403
+
.adr_d = cs35l63x2_l1u13_adr,
404
+
},
405
+
{}
406
+
};
407
+
408
+
static const struct snd_soc_acpi_link_adr acp63_cs42l45_l1u0[] = {
409
+
{
410
+
.mask = BIT(1),
411
+
.num_adr = ARRAY_SIZE(cs42l45_l1u0_adr),
412
+
.adr_d = cs42l45_l1u0_adr,
413
+
},
414
+
{}
415
+
};
416
+
417
+
static const struct snd_soc_acpi_link_adr acp63_cs42l45_l1u0_cs35l63x2_l0u01[] = {
418
+
{
419
+
.mask = BIT(1),
420
+
.num_adr = ARRAY_SIZE(cs42l45_l1u0_adr),
421
+
.adr_d = cs42l45_l1u0_adr,
422
+
},
423
+
{
424
+
.mask = BIT(0),
425
+
.num_adr = ARRAY_SIZE(cs35l63x2_l0u01_adr),
426
+
.adr_d = cs35l63x2_l0u01_adr,
427
+
},
428
+
{}
429
+
};
430
+
431
+
static const struct snd_soc_acpi_link_adr acp63_cs42l45_l1u0_cs35l63x4_l0u0246[] = {
432
+
{
433
+
.mask = BIT(1),
434
+
.num_adr = ARRAY_SIZE(cs42l45_l1u0_adr),
435
+
.adr_d = cs42l45_l1u0_adr,
436
+
},
437
+
{
438
+
.mask = BIT(0),
439
+
.num_adr = ARRAY_SIZE(cs35l63x4_l0u0246_adr),
440
+
.adr_d = cs35l63x4_l0u0246_adr,
441
+
},
442
+
{}
443
+
};
444
+
120
445
static const struct snd_soc_acpi_link_adr acp63_rt722_only[] = {
121
446
{
122
447
.mask = BIT(0),
···
486
133
{
487
134
.link_mask = BIT(0) | BIT(1),
488
135
.links = acp63_4_in_1_sdca,
136
+
.drv_name = "amd_sdw",
137
+
},
138
+
{
139
+
.link_mask = BIT(0) | BIT(1),
140
+
.links = acp63_cs42l43_l0u0_cs35l56x4_l1u3210,
141
+
.drv_name = "amd_sdw",
142
+
},
143
+
{
144
+
.link_mask = BIT(0) | BIT(1),
145
+
.links = acp63_cs42l45_l1u0_cs35l63x4_l0u0246,
146
+
.drv_name = "amd_sdw",
147
+
},
148
+
{
149
+
.link_mask = BIT(0) | BIT(1),
150
+
.links = acp63_cs42l45_l0u0_cs35l63x2_l1u01,
151
+
.drv_name = "amd_sdw",
152
+
},
153
+
{
154
+
.link_mask = BIT(0) | BIT(1),
155
+
.links = acp63_cs42l45_l0u0_cs35l63x2_l1u13,
156
+
.drv_name = "amd_sdw",
157
+
},
158
+
{
159
+
.link_mask = BIT(0) | BIT(1),
160
+
.links = acp63_cs42l45_l1u0_cs35l63x2_l0u01,
161
+
.drv_name = "amd_sdw",
162
+
},
163
+
{
164
+
.link_mask = BIT(1),
165
+
.links = acp63_cs42l43_l1u0_cs35l56x4_l1u0123,
166
+
.drv_name = "amd_sdw",
167
+
},
168
+
{
169
+
.link_mask = BIT(1),
170
+
.links = acp63_cs35l56x4_l1u3210,
171
+
.drv_name = "amd_sdw",
172
+
},
173
+
{
174
+
.link_mask = BIT(0),
175
+
.links = acp63_cs35l63x4_l0u0246,
176
+
.drv_name = "amd_sdw",
177
+
},
178
+
{
179
+
.link_mask = BIT(0),
180
+
.links = acp63_cs42l43_l0u1,
181
+
.drv_name = "amd_sdw",
182
+
},
183
+
{
184
+
.link_mask = BIT(0),
185
+
.links = acp63_cs42l43b_l0u1,
186
+
.drv_name = "amd_sdw",
187
+
},
188
+
{
189
+
.link_mask = BIT(0),
190
+
.links = acp63_cs42l45_l0u0,
191
+
.drv_name = "amd_sdw",
192
+
},
193
+
{
194
+
.link_mask = BIT(1),
195
+
.links = acp63_cs42l45_l1u0,
489
196
.drv_name = "amd_sdw",
490
197
},
491
198
{},