~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/sound/soc/intel/common/soc-acpi-intel-arl-match.c

Version: ~ [ linux-6.12-rc7 ] ~ [ linux-6.11.7 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.60 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.116 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.171 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.229 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.285 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.323 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.12 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /sound/soc/intel/common/soc-acpi-intel-arl-match.c (Version linux-6.12-rc7) and /sound/soc/intel/common/soc-acpi-intel-arl-match.c (Version linux-6.7.12)


  1 // SPDX-License-Identifier: GPL-2.0-only            1 // SPDX-License-Identifier: GPL-2.0-only
  2 /*                                                  2 /*
  3  * soc-apci-intel-arl-match.c - tables and sup      3  * soc-apci-intel-arl-match.c - tables and support for ARL ACPI enumeration.
  4  *                                                  4  *
  5  * Copyright (c) 2023 Intel Corporation.            5  * Copyright (c) 2023 Intel Corporation.
  6  */                                                 6  */
  7                                                     7 
  8 #include <sound/soc-acpi.h>                         8 #include <sound/soc-acpi.h>
  9 #include <sound/soc-acpi-intel-match.h>             9 #include <sound/soc-acpi-intel-match.h>
 10 #include <sound/soc-acpi-intel-ssp-common.h>   << 
 11                                                    10 
 12 static const struct snd_soc_acpi_endpoint sing     11 static const struct snd_soc_acpi_endpoint single_endpoint = {
 13         .num = 0,                                  12         .num = 0,
 14         .aggregated = 0,                           13         .aggregated = 0,
 15         .group_position = 0,                       14         .group_position = 0,
 16         .group_id = 0,                             15         .group_id = 0,
 17 };                                                 16 };
 18                                                    17 
 19 static const struct snd_soc_acpi_endpoint spk_ << 
 20         .num = 0,                              << 
 21         .aggregated = 1,                       << 
 22         .group_position = 0,                   << 
 23         .group_id = 1,                         << 
 24 };                                             << 
 25                                                << 
 26 static const struct snd_soc_acpi_endpoint spk_ << 
 27         .num = 0,                              << 
 28         .aggregated = 1,                       << 
 29         .group_position = 1,                   << 
 30         .group_id = 1,                         << 
 31 };                                             << 
 32                                                << 
 33 static const struct snd_soc_acpi_endpoint spk_ << 
 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_ << 
 41         .num = 0,                              << 
 42         .aggregated = 1,                       << 
 43         .group_position = 3,                   << 
 44         .group_id = 1,                         << 
 45 };                                             << 
 46                                                << 
 47 static const struct snd_soc_acpi_adr_device cs << 
 48         {                                      << 
 49                 .adr = 0x00023001FA355601ull,  << 
 50                 .num_endpoints = 1,            << 
 51                 .endpoints = &spk_l_endpoint,  << 
 52                 .name_prefix = "AMP1"          << 
 53         },                                     << 
 54         {                                      << 
 55                 .adr = 0x00023101FA355601ull,  << 
 56                 .num_endpoints = 1,            << 
 57                 .endpoints = &spk_r_endpoint,  << 
 58                 .name_prefix = "AMP2"          << 
 59         }                                      << 
 60 };                                             << 
 61                                                << 
 62 static const struct snd_soc_acpi_adr_device cs << 
 63         {                                      << 
 64                 .adr = 0x00033001FA355601ull,  << 
 65                 .num_endpoints = 1,            << 
 66                 .endpoints = &spk_l_endpoint,  << 
 67                 .name_prefix = "AMP1"          << 
 68         },                                     << 
 69         {                                      << 
 70                 .adr = 0x00033401FA355601ull,  << 
 71                 .num_endpoints = 1,            << 
 72                 .endpoints = &spk_r_endpoint,  << 
 73                 .name_prefix = "AMP2"          << 
 74         }                                      << 
 75 };                                             << 
 76                                                << 
 77 static const struct snd_soc_acpi_adr_device cs << 
 78         {                                      << 
 79                 .adr = 0x00023201FA355601ull,  << 
 80                 .num_endpoints = 1,            << 
 81                 .endpoints = &spk_r_endpoint,  << 
 82                 .name_prefix = "AMP3"          << 
 83         },                                     << 
 84         {                                      << 
 85                 .adr = 0x00023301FA355601ull,  << 
 86                 .num_endpoints = 1,            << 
 87                 .endpoints = &spk_3_endpoint,  << 
 88                 .name_prefix = "AMP4"          << 
 89         }                                      << 
 90 };                                             << 
 91                                                << 
 92 static const struct snd_soc_acpi_adr_device cs << 
 93         {                                      << 
 94                 .adr = 0x00033001fa355601ull,  << 
 95                 .num_endpoints = 1,            << 
 96                 .endpoints = &spk_l_endpoint,  << 
 97                 .name_prefix = "AMP1"          << 
 98         },                                     << 
 99         {                                      << 
100                 .adr = 0x00033101fa355601ull,  << 
101                 .num_endpoints = 1,            << 
102                 .endpoints = &spk_2_endpoint,  << 
103                 .name_prefix = "AMP2"          << 
104         }                                      << 
105 };                                             << 
106                                                << 
107 static const struct snd_soc_acpi_adr_device cs << 
108         {                                      << 
109                 .adr = 0x00023101FA355601ull,  << 
110                 .num_endpoints = 1,            << 
111                 .endpoints = &spk_r_endpoint,  << 
112                 .name_prefix = "AMP2"          << 
113         },                                     << 
114 };                                             << 
115                                                << 
116 static const struct snd_soc_acpi_adr_device cs << 
117         {                                      << 
118                 .adr = 0x00033301fa355601ull,  << 
119                 .num_endpoints = 1,            << 
120                 .endpoints = &spk_l_endpoint,  << 
121                 .name_prefix = "AMP1"          << 
122         },                                     << 
123 };                                             << 
124                                                << 
125 static const struct snd_soc_acpi_endpoint cs42 << 
126         { /* Jack Playback Endpoint */         << 
127                 .num = 0,                      << 
128                 .aggregated = 0,               << 
129                 .group_position = 0,           << 
130                 .group_id = 0,                 << 
131         },                                     << 
132         { /* DMIC Capture Endpoint */          << 
133                 .num = 1,                      << 
134                 .aggregated = 0,               << 
135                 .group_position = 0,           << 
136                 .group_id = 0,                 << 
137         },                                     << 
138         { /* Jack Capture Endpoint */          << 
139                 .num = 2,                      << 
140                 .aggregated = 0,               << 
141                 .group_position = 0,           << 
142                 .group_id = 0,                 << 
143         },                                     << 
144         { /* Speaker Playback Endpoint */      << 
145                 .num = 3,                      << 
146                 .aggregated = 0,               << 
147                 .group_position = 0,           << 
148                 .group_id = 0,                 << 
149         },                                     << 
150 };                                             << 
151                                                << 
152 static const struct snd_soc_acpi_adr_device cs << 
153         {                                      << 
154                 .adr = 0x00003001FA424301ull,  << 
155                 .num_endpoints = ARRAY_SIZE(cs << 
156                 .endpoints = cs42l43_endpoints << 
157                 .name_prefix = "cs42l43"       << 
158         }                                      << 
159 };                                             << 
160                                                << 
161 static const struct snd_soc_acpi_adr_device cs << 
162         {                                      << 
163                 .adr = 0x00023001FA424301ull,  << 
164                 .num_endpoints = ARRAY_SIZE(cs << 
165                 .endpoints = cs42l43_endpoints << 
166                 .name_prefix = "cs42l43"       << 
167         }                                      << 
168 };                                             << 
169                                                << 
170 static const struct snd_soc_acpi_adr_device rt     18 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
171         {                                          19         {
172                 .adr = 0x000020025D071100ull,      20                 .adr = 0x000020025D071100ull,
173                 .num_endpoints = 1,                21                 .num_endpoints = 1,
174                 .endpoints = &single_endpoint,     22                 .endpoints = &single_endpoint,
175                 .name_prefix = "rt711"             23                 .name_prefix = "rt711"
176         }                                          24         }
177 };                                                 25 };
178                                                    26 
179 static const struct snd_soc_acpi_adr_device rt << 
180         {                                      << 
181                 .adr = 0x000030025D071101ull,  << 
182                 .num_endpoints = 1,            << 
183                 .endpoints = &single_endpoint, << 
184                 .name_prefix = "rt711"         << 
185         }                                      << 
186 };                                             << 
187                                                << 
188 static const struct snd_soc_acpi_link_adr arl_ << 
189         {                                      << 
190                 .mask = BIT(0),                << 
191                 .num_adr = ARRAY_SIZE(cs42l43_ << 
192                 .adr_d = cs42l43_0_adr,        << 
193         },                                     << 
194         {}                                     << 
195 };                                             << 
196                                                << 
197 static const struct snd_soc_acpi_link_adr arl_ << 
198         {                                      << 
199                 .mask = BIT(2),                << 
200                 .num_adr = ARRAY_SIZE(cs42l43_ << 
201                 .adr_d = cs42l43_2_adr,        << 
202         },                                     << 
203         {}                                     << 
204 };                                             << 
205                                                << 
206 static const struct snd_soc_acpi_link_adr arl_ << 
207         {                                      << 
208                 .mask = BIT(2),                << 
209                 .num_adr = ARRAY_SIZE(cs42l43_ << 
210                 .adr_d = cs42l43_2_adr,        << 
211         },                                     << 
212         {                                      << 
213                 .mask = BIT(3),                << 
214                 .num_adr = ARRAY_SIZE(cs35l56_ << 
215                 .adr_d = cs35l56_3_lr_adr,     << 
216         },                                     << 
217         {}                                     << 
218 };                                             << 
219                                                << 
220 static const struct snd_soc_acpi_link_adr arl_ << 
221         {                                      << 
222                 .mask = BIT(0),                << 
223                 .num_adr = ARRAY_SIZE(cs42l43_ << 
224                 .adr_d = cs42l43_0_adr,        << 
225         },                                     << 
226         {                                      << 
227                 .mask = BIT(2),                << 
228                 .num_adr = ARRAY_SIZE(cs35l56_ << 
229                 .adr_d = cs35l56_2_lr_adr,     << 
230         },                                     << 
231         {}                                     << 
232 };                                             << 
233                                                << 
234 static const struct snd_soc_acpi_link_adr arl_ << 
235         {                                      << 
236                 .mask = BIT(0),                << 
237                 .num_adr = ARRAY_SIZE(cs42l43_ << 
238                 .adr_d = cs42l43_0_adr,        << 
239         },                                     << 
240         {                                      << 
241                 .mask = BIT(2),                << 
242                 .num_adr = ARRAY_SIZE(cs35l56_ << 
243                 .adr_d = cs35l56_2_r_adr,      << 
244         },                                     << 
245         {                                      << 
246                 .mask = BIT(3),                << 
247                 .num_adr = ARRAY_SIZE(cs35l56_ << 
248                 .adr_d = cs35l56_3_l_adr,      << 
249         },                                     << 
250         {}                                     << 
251 };                                             << 
252                                                << 
253 static const struct snd_soc_acpi_link_adr arl_ << 
254         {                                      << 
255                 .mask = BIT(0),                << 
256                 .num_adr = ARRAY_SIZE(cs42l43_ << 
257                 .adr_d = cs42l43_0_adr,        << 
258         },                                     << 
259         {                                      << 
260                 .mask = BIT(2),                << 
261                 .num_adr = ARRAY_SIZE(cs35l56_ << 
262                 .adr_d = cs35l56_2_r1_adr,     << 
263         },                                     << 
264         {                                      << 
265                 .mask = BIT(3),                << 
266                 .num_adr = ARRAY_SIZE(cs35l56_ << 
267                 .adr_d = cs35l56_3_l1_adr,     << 
268         },                                     << 
269         {}                                     << 
270 };                                             << 
271                                                << 
272 static const struct snd_soc_acpi_link_adr arl_     27 static const struct snd_soc_acpi_link_adr arl_rvp[] = {
273         {                                          28         {
274                 .mask = BIT(0),                    29                 .mask = BIT(0),
275                 .num_adr = ARRAY_SIZE(rt711_0_     30                 .num_adr = ARRAY_SIZE(rt711_0_adr),
276                 .adr_d = rt711_0_adr,              31                 .adr_d = rt711_0_adr,
277         },                                         32         },
278         {}                                         33         {}
279 };                                                 34 };
280                                                    35 
281 static const struct snd_soc_acpi_link_adr arl_ << 
282         {                                      << 
283                 .mask = BIT(0),                << 
284                 .num_adr = ARRAY_SIZE(rt711_sd << 
285                 .adr_d = rt711_sdca_0_adr,     << 
286         },                                     << 
287         {}                                     << 
288 };                                             << 
289                                                << 
290 static const struct snd_soc_acpi_codecs arl_es << 
291         .num_codecs = 3,                       << 
292         .codecs = { "ESSX8316", "ESSX8326", "E << 
293 };                                             << 
294                                                << 
295 static const struct snd_soc_acpi_codecs arl_rt << 
296         .num_codecs = 2,                       << 
297         .codecs = {RT5682_ACPI_HID, RT5682S_AC << 
298 };                                             << 
299                                                << 
300 static const struct snd_soc_acpi_codecs arl_lt << 
301         .num_codecs = 1,                       << 
302         .codecs = {"INTC10B0"}                 << 
303 };                                             << 
304                                                << 
305 struct snd_soc_acpi_mach snd_soc_acpi_intel_ar     36 struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[] = {
306         {                                      << 
307                 .comp_ids = &arl_essx_83x6,    << 
308                 .drv_name = "arl_es83x6_c1_h02 << 
309                 .machine_quirk = snd_soc_acpi_ << 
310                 .quirk_data = &arl_lt6911_hdmi << 
311                 .sof_tplg_filename = "sof-arl- << 
312         },                                     << 
313         {                                      << 
314                 .comp_ids = &arl_essx_83x6,    << 
315                 .drv_name = "sof-essx8336",    << 
316                 .sof_tplg_filename = "sof-arl- << 
317                 .tplg_quirk_mask = SND_SOC_ACP << 
318                         SND_SOC_ACPI_TPLG_INTE << 
319                         SND_SOC_ACPI_TPLG_INTE << 
320         },                                     << 
321         {                                      << 
322                 .comp_ids = &arl_rt5682_hp,    << 
323                 .drv_name = "arl_rt5682_c1_h02 << 
324                 .machine_quirk = snd_soc_acpi_ << 
325                 .quirk_data = &arl_lt6911_hdmi << 
326                 .sof_tplg_filename = "sof-arl- << 
327         },                                     << 
328         /* place amp-only boards in the end of << 
329         {                                      << 
330                 .id = "INTC10B0",              << 
331                 .drv_name = "arl_lt6911_hdmi_s << 
332                 .sof_tplg_filename = "sof-arl- << 
333         },                                     << 
334         {},                                        37         {},
335 };                                                 38 };
336 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_machi     39 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_machines);
337                                                    40 
338 /* this table is used when there is no I2S cod     41 /* this table is used when there is no I2S codec present */
339 struct snd_soc_acpi_mach snd_soc_acpi_intel_ar     42 struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
340         {                                          43         {
341                 .link_mask = BIT(0) | BIT(2) | << 
342                 .links = arl_cs42l43_l0_cs35l5 << 
343                 .drv_name = "sof_sdw",         << 
344                 .sof_tplg_filename = "sof-arl- << 
345         },                                     << 
346         {                                      << 
347                 .link_mask = BIT(0) | BIT(2) | << 
348                 .links = arl_cs42l43_l0_cs35l5 << 
349                 .drv_name = "sof_sdw",         << 
350                 .sof_tplg_filename = "sof-arl- << 
351         },                                     << 
352         {                                      << 
353                 .link_mask = BIT(0) | BIT(2),  << 
354                 .links = arl_cs42l43_l0_cs35l5 << 
355                 .drv_name = "sof_sdw",         << 
356                 .sof_tplg_filename = "sof-arl- << 
357         },                                     << 
358         {                                      << 
359                 .link_mask = BIT(0),           << 
360                 .links = arl_cs42l43_l0,       << 
361                 .drv_name = "sof_sdw",         << 
362                 .sof_tplg_filename = "sof-arl- << 
363         },                                     << 
364         {                                      << 
365                 .link_mask = BIT(2),           << 
366                 .links = arl_cs42l43_l2,       << 
367                 .drv_name = "sof_sdw",         << 
368                 .sof_tplg_filename = "sof-arl- << 
369         },                                     << 
370         {                                      << 
371                 .link_mask = BIT(2) | BIT(3),  << 
372                 .links = arl_cs42l43_l2_cs35l5 << 
373                 .drv_name = "sof_sdw",         << 
374                 .sof_tplg_filename = "sof-arl- << 
375         },                                     << 
376         {                                      << 
377                 .link_mask = 0x1, /* link0 req     44                 .link_mask = 0x1, /* link0 required */
378                 .links = arl_rvp,                  45                 .links = arl_rvp,
379                 .drv_name = "sof_sdw",             46                 .drv_name = "sof_sdw",
380                 .sof_tplg_filename = "sof-arl-     47                 .sof_tplg_filename = "sof-arl-rt711.tplg",
381         },                                     << 
382         {                                      << 
383                 .link_mask = 0x1, /* link0 req << 
384                 .links = arl_sdca_rvp,         << 
385                 .drv_name = "sof_sdw",         << 
386                 .sof_tplg_filename = "sof-arl- << 
387         },                                         48         },
388         {},                                        49         {},
389 };                                                 50 };
390 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_m     51 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_machines);
391                                                    52 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php