Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Merge up fixes
This is needed for some new work on max98091.
Merge branch 'for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-6.19
+164
-56
+157
sound/soc/amd/acp/amd-acp70-acpi-match.c
+157
sound/soc/amd/acp/amd-acp70-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,
···
126
112
}
127
113
};
128
114
115
+
static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
116
+
{ /* Jack Playback Endpoint */
117
+
.num = 0,
118
+
.aggregated = 0,
119
+
.group_position = 0,
120
+
.group_id = 0,
121
+
},
122
+
{ /* DMIC Capture Endpoint */
123
+
.num = 1,
124
+
.aggregated = 0,
125
+
.group_position = 0,
126
+
.group_id = 0,
127
+
},
128
+
{ /* Jack Capture Endpoint */
129
+
.num = 2,
130
+
.aggregated = 0,
131
+
.group_position = 0,
132
+
.group_id = 0,
133
+
},
134
+
{ /* Speaker Playback Endpoint */
135
+
.num = 3,
136
+
.aggregated = 0,
137
+
.group_position = 0,
138
+
.group_id = 0,
139
+
},
140
+
};
141
+
142
+
static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {
143
+
{
144
+
.adr = 0x00003001FA424301ull,
145
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
146
+
.endpoints = cs42l43_endpoints,
147
+
.name_prefix = "cs42l43"
148
+
}
149
+
};
150
+
151
+
static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = {
152
+
{
153
+
.adr = 0x00013001FA424301ull,
154
+
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
155
+
.endpoints = cs42l43_endpoints,
156
+
.name_prefix = "cs42l43"
157
+
},
158
+
{
159
+
.adr = 0x00013001FA355601ull,
160
+
.num_endpoints = 1,
161
+
.endpoints = &spk_l_endpoint,
162
+
.name_prefix = "AMP1"
163
+
},
164
+
{
165
+
.adr = 0x00013101FA355601ull,
166
+
.num_endpoints = 1,
167
+
.endpoints = &spk_r_endpoint,
168
+
.name_prefix = "AMP2"
169
+
},
170
+
{
171
+
.adr = 0x00013201FA355601ull,
172
+
.num_endpoints = 1,
173
+
.endpoints = &spk_2_endpoint,
174
+
.name_prefix = "AMP3"
175
+
},
176
+
{
177
+
.adr = 0x00013301FA355601ull,
178
+
.num_endpoints = 1,
179
+
.endpoints = &spk_3_endpoint,
180
+
.name_prefix = "AMP4"
181
+
},
182
+
};
183
+
184
+
static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = {
185
+
{
186
+
.adr = 0x00013301FA355601ull,
187
+
.num_endpoints = 1,
188
+
.endpoints = &spk_l_endpoint,
189
+
.name_prefix = "AMP1"
190
+
},
191
+
{
192
+
.adr = 0x00013201FA355601ull,
193
+
.num_endpoints = 1,
194
+
.endpoints = &spk_r_endpoint,
195
+
.name_prefix = "AMP2"
196
+
},
197
+
{
198
+
.adr = 0x00013101FA355601ull,
199
+
.num_endpoints = 1,
200
+
.endpoints = &spk_2_endpoint,
201
+
.name_prefix = "AMP3"
202
+
},
203
+
{
204
+
.adr = 0x00013001FA355601ull,
205
+
.num_endpoints = 1,
206
+
.endpoints = &spk_3_endpoint,
207
+
.name_prefix = "AMP4"
208
+
},
209
+
};
210
+
211
+
static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1_cs35l56x4_l1[] = {
212
+
{
213
+
.mask = BIT(1),
214
+
.num_adr = ARRAY_SIZE(cs42l43_1_cs35l56x4_1_adr),
215
+
.adr_d = cs42l43_1_cs35l56x4_1_adr,
216
+
},
217
+
{}
218
+
};
219
+
220
+
static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0_cs35l56x4_l1[] = {
221
+
{
222
+
.mask = BIT(0),
223
+
.num_adr = ARRAY_SIZE(cs42l43_0_adr),
224
+
.adr_d = cs42l43_0_adr,
225
+
},
226
+
{
227
+
.mask = BIT(1),
228
+
.num_adr = ARRAY_SIZE(cs35l56x4_1_adr),
229
+
.adr_d = cs35l56x4_1_adr,
230
+
},
231
+
{}
232
+
};
233
+
234
+
static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1[] = {
235
+
{
236
+
.mask = BIT(1),
237
+
.num_adr = ARRAY_SIZE(cs35l56x4_1_adr),
238
+
.adr_d = cs35l56x4_1_adr,
239
+
},
240
+
{}
241
+
};
242
+
129
243
static const struct snd_soc_acpi_link_adr acp70_rt722_only[] = {
130
244
{
131
245
.mask = BIT(0),
···
291
149
{
292
150
.link_mask = BIT(0) | BIT(1),
293
151
.links = acp70_4_in_1_sdca,
152
+
.drv_name = "amd_sdw",
153
+
},
154
+
{
155
+
.link_mask = BIT(0) | BIT(1),
156
+
.links = acp70_cs42l43_l0_cs35l56x4_l1,
157
+
.drv_name = "amd_sdw",
158
+
},
159
+
{
160
+
.link_mask = BIT(1),
161
+
.links = acp70_cs42l43_l1_cs35l56x4_l1,
162
+
.drv_name = "amd_sdw",
163
+
},
164
+
{
165
+
.link_mask = BIT(1),
166
+
.links = acp70_cs35l56x4_l1,
294
167
.drv_name = "amd_sdw",
295
168
},
296
169
{},
+1
sound/soc/codecs/cs-amp-lib-test.c
+1
sound/soc/codecs/cs-amp-lib-test.c
+1
-1
sound/soc/codecs/cs530x.c
+1
-1
sound/soc/codecs/cs530x.c
+4
-2
sound/soc/codecs/max98090.c
+4
-2
sound/soc/codecs/max98090.c
···
1239
1239
SND_SOC_DAPM_SUPPLY("DMIC4_ENA", M98090_REG_DIGITAL_MIC_ENABLE,
1240
1240
M98090_DIGMIC4_SHIFT, 0, max98090_shdn_event,
1241
1241
SND_SOC_DAPM_POST_PMU),
1242
+
SND_SOC_DAPM_SUPPLY("DMIC34_HPF", M98090_REG_FILTER_CONFIG,
1243
+
M98090_FLT_DMIC34HPF_SHIFT, 0, NULL, 0),
1242
1244
};
1243
1245
1244
1246
static const struct snd_soc_dapm_route max98090_dapm_routes[] = {
···
1429
1427
/* DMIC inputs */
1430
1428
{"DMIC3", NULL, "DMIC3_ENA"},
1431
1429
{"DMIC4", NULL, "DMIC4_ENA"},
1432
-
{"DMIC3", NULL, "AHPF"},
1433
-
{"DMIC4", NULL, "AHPF"},
1430
+
{"DMIC3", NULL, "DMIC34_HPF"},
1431
+
{"DMIC4", NULL, "DMIC34_HPF"},
1434
1432
};
1435
1433
1436
1434
static int max98090_add_widgets(struct snd_soc_component *component)
-52
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
-52
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
···
227
227
},
228
228
};
229
229
230
-
static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
231
-
{ /* Jack Playback Endpoint */
232
-
.num = 0,
233
-
.aggregated = 0,
234
-
.group_position = 0,
235
-
.group_id = 0,
236
-
},
237
-
{ /* DMIC Capture Endpoint */
238
-
.num = 1,
239
-
.aggregated = 0,
240
-
.group_position = 0,
241
-
.group_id = 0,
242
-
},
243
-
{ /* Jack Capture Endpoint */
244
-
.num = 2,
245
-
.aggregated = 0,
246
-
.group_position = 0,
247
-
.group_id = 0,
248
-
},
249
-
{ /* Speaker Playback Endpoint */
250
-
.num = 3,
251
-
.aggregated = 0,
252
-
.group_position = 0,
253
-
.group_id = 0,
254
-
},
255
-
};
256
-
257
230
static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
258
231
{
259
232
.adr = 0x00023001fa424301ull,
···
275
302
.num_endpoints = 1,
276
303
.endpoints = &spk_6_endpoint,
277
304
.name_prefix = "AMP6"
278
-
}
279
-
};
280
-
281
-
static const struct snd_soc_acpi_adr_device cs42l43_3_adr[] = {
282
-
{
283
-
.adr = 0x00033001FA424301ull,
284
-
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
285
-
.endpoints = cs42l43_endpoints,
286
-
.name_prefix = "cs42l43"
287
305
}
288
306
};
289
307
···
446
482
.mask = BIT(3),
447
483
.num_adr = ARRAY_SIZE(cs35l56_3_3amp_adr),
448
484
.adr_d = cs35l56_3_3amp_adr,
449
-
},
450
-
{}
451
-
};
452
-
453
-
static const struct snd_soc_acpi_link_adr ptl_cs42l43_l3[] = {
454
-
{
455
-
.mask = BIT(3),
456
-
.num_adr = ARRAY_SIZE(cs42l43_3_adr),
457
-
.adr_d = cs42l43_3_adr,
458
485
},
459
486
{}
460
487
};
···
665
710
.links = ptl_rt722_l1,
666
711
.drv_name = "sof_sdw",
667
712
.sof_tplg_filename = "sof-ptl-rt722.tplg",
668
-
.get_function_tplg_files = sof_sdw_get_tplg_files,
669
-
},
670
-
{
671
-
.link_mask = BIT(3),
672
-
.links = ptl_cs42l43_l3,
673
-
.drv_name = "sof_sdw",
674
-
.sof_tplg_filename = "sof-ptl-cs42l43-l3.tplg",
675
713
.get_function_tplg_files = sof_sdw_get_tplg_files,
676
714
},
677
715
{
+1
-1
sound/soc/qcom/qdsp6/q6asm.c
+1
-1
sound/soc/qcom/qdsp6/q6asm.c