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

TOMOYO Linux Cross Reference
Linux/sound/soc/intel/common/soc-acpi-intel-icl-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-icl-match.c (Version linux-6.12-rc7) and /sound/soc/intel/common/soc-acpi-intel-icl-match.c (Version linux-5.9.16)


  1 // SPDX-License-Identifier: GPL-2.0-only            1 // SPDX-License-Identifier: GPL-2.0-only
  2 /*                                                  2 /*
  3  * soc-acpi-intel-icl-match.c - tables and sup      3  * soc-acpi-intel-icl-match.c - tables and support for ICL ACPI enumeration.
  4  *                                                  4  *
  5  * Copyright (c) 2018, Intel Corporation.           5  * Copyright (c) 2018, Intel Corporation.
  6  *                                                  6  *
  7  */                                                 7  */
  8                                                     8 
  9 #include <sound/soc-acpi.h>                         9 #include <sound/soc-acpi.h>
 10 #include <sound/soc-acpi-intel-match.h>            10 #include <sound/soc-acpi-intel-match.h>
                                                   >>  11 #include "../skylake/skl.h"
 11                                                    12 
 12 static const struct snd_soc_acpi_codecs essx_8 !!  13 static struct skl_machine_pdata icl_pdata = {
 13         .num_codecs = 3,                       !!  14         .use_tplg_pcm = true,
 14         .codecs = { "ESSX8316", "ESSX8326", "E << 
 15 };                                                 15 };
 16                                                    16 
 17 struct snd_soc_acpi_mach snd_soc_acpi_intel_ic     17 struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
 18         {                                          18         {
 19                 .id = "INT34C2",                   19                 .id = "INT34C2",
 20                 .drv_name = "icl_rt274",           20                 .drv_name = "icl_rt274",
 21                 .fw_filename = "intel/dsp_fw_i     21                 .fw_filename = "intel/dsp_fw_icl.bin",
                                                   >>  22                 .pdata = &icl_pdata,
                                                   >>  23                 .sof_fw_filename = "sof-icl.ri",
 22                 .sof_tplg_filename = "sof-icl-     24                 .sof_tplg_filename = "sof-icl-rt274.tplg",
 23         },                                         25         },
 24         {                                          26         {
 25                 .id = "10EC5682",                  27                 .id = "10EC5682",
 26                 .drv_name = "icl_rt5682_def",  !!  28                 .drv_name = "sof_rt5682",
                                                   >>  29                 .sof_fw_filename = "sof-icl.ri",
 27                 .sof_tplg_filename = "sof-icl-     30                 .sof_tplg_filename = "sof-icl-rt5682.tplg",
 28         },                                         31         },
 29         {                                      << 
 30                 .comp_ids = &essx_83x6,        << 
 31                 .drv_name = "sof-essx8336",    << 
 32                 .sof_tplg_filename = "sof-icl- << 
 33                 .tplg_quirk_mask = SND_SOC_ACP << 
 34                                         SND_SO << 
 35                                         SND_SO << 
 36         },                                     << 
 37         {},                                        32         {},
 38 };                                                 33 };
 39 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machi     34 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines);
 40                                                    35 
 41 static const struct snd_soc_acpi_endpoint sing     36 static const struct snd_soc_acpi_endpoint single_endpoint = {
 42         .num = 0,                                  37         .num = 0,
 43         .aggregated = 0,                           38         .aggregated = 0,
 44         .group_position = 0,                       39         .group_position = 0,
 45         .group_id = 0,                             40         .group_id = 0,
 46 };                                                 41 };
 47                                                    42 
 48 static const struct snd_soc_acpi_endpoint spk_     43 static const struct snd_soc_acpi_endpoint spk_l_endpoint = {
 49         .num = 0,                                  44         .num = 0,
 50         .aggregated = 1,                           45         .aggregated = 1,
 51         .group_position = 0,                       46         .group_position = 0,
 52         .group_id = 1,                             47         .group_id = 1,
 53 };                                                 48 };
 54                                                    49 
 55 static const struct snd_soc_acpi_endpoint spk_     50 static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
 56         .num = 0,                                  51         .num = 0,
 57         .aggregated = 1,                           52         .aggregated = 1,
 58         .group_position = 1,                       53         .group_position = 1,
 59         .group_id = 1,                             54         .group_id = 1,
 60 };                                                 55 };
 61                                                    56 
 62 static const struct snd_soc_acpi_adr_device rt     57 static const struct snd_soc_acpi_adr_device rt700_0_adr[] = {
 63         {                                          58         {
 64                 .adr = 0x000010025D070000ull,  !!  59                 .adr = 0x000010025D070000,
 65                 .num_endpoints = 1,                60                 .num_endpoints = 1,
 66                 .endpoints = &single_endpoint,     61                 .endpoints = &single_endpoint,
 67                 .name_prefix = "rt700"         << 
 68         }                                          62         }
 69 };                                                 63 };
 70                                                    64 
 71 static const struct snd_soc_acpi_link_adr icl_     65 static const struct snd_soc_acpi_link_adr icl_rvp[] = {
 72         {                                          66         {
 73                 .mask = BIT(0),                    67                 .mask = BIT(0),
 74                 .num_adr = ARRAY_SIZE(rt700_0_     68                 .num_adr = ARRAY_SIZE(rt700_0_adr),
 75                 .adr_d = rt700_0_adr,              69                 .adr_d = rt700_0_adr,
 76         },                                         70         },
 77         {}                                         71         {}
 78 };                                                 72 };
 79                                                    73 
 80 static const struct snd_soc_acpi_adr_device rt     74 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
 81         {                                          75         {
 82                 .adr = 0x000020025D071100ull,  !!  76                 .adr = 0x000010025D071100,
 83                 .num_endpoints = 1,                77                 .num_endpoints = 1,
 84                 .endpoints = &single_endpoint,     78                 .endpoints = &single_endpoint,
 85                 .name_prefix = "rt711"         << 
 86         }                                          79         }
 87 };                                                 80 };
 88                                                    81 
 89 static const struct snd_soc_acpi_adr_device rt     82 static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
 90         {                                          83         {
 91                 .adr = 0x000120025D130800ull,  !!  84                 .adr = 0x000110025D130800,
 92                 .num_endpoints = 1,                85                 .num_endpoints = 1,
 93                 .endpoints = &single_endpoint,     86                 .endpoints = &single_endpoint,
 94                 .name_prefix = "rt1308-1"      << 
 95         }                                          87         }
 96 };                                                 88 };
 97                                                    89 
 98 static const struct snd_soc_acpi_adr_device rt     90 static const struct snd_soc_acpi_adr_device rt1308_1_group1_adr[] = {
 99         {                                          91         {
100                 .adr = 0x000120025D130800ull,  !!  92                 .adr = 0x000110025D130800,
101                 .num_endpoints = 1,                93                 .num_endpoints = 1,
102                 .endpoints = &spk_l_endpoint,      94                 .endpoints = &spk_l_endpoint,
103                 .name_prefix = "rt1308-1"      << 
104         }                                          95         }
105 };                                                 96 };
106                                                    97 
107 static const struct snd_soc_acpi_adr_device rt     98 static const struct snd_soc_acpi_adr_device rt1308_2_group1_adr[] = {
108         {                                          99         {
109                 .adr = 0x000220025D130800ull,  !! 100                 .adr = 0x000210025D130800,
110                 .num_endpoints = 1,               101                 .num_endpoints = 1,
111                 .endpoints = &spk_r_endpoint,     102                 .endpoints = &spk_r_endpoint,
112                 .name_prefix = "rt1308-2"      << 
113         }                                         103         }
114 };                                                104 };
115                                                   105 
116 static const struct snd_soc_acpi_adr_device rt    106 static const struct snd_soc_acpi_adr_device rt715_3_adr[] = {
117         {                                         107         {
118                 .adr = 0x000320025D071500ull,  !! 108                 .adr = 0x000310025D071500,
119                 .num_endpoints = 1,               109                 .num_endpoints = 1,
120                 .endpoints = &single_endpoint,    110                 .endpoints = &single_endpoint,
121                 .name_prefix = "rt715"         << 
122         }                                         111         }
123 };                                                112 };
124                                                   113 
125 static const struct snd_soc_acpi_link_adr icl_    114 static const struct snd_soc_acpi_link_adr icl_3_in_1_default[] = {
126         {                                         115         {
127                 .mask = BIT(0),                   116                 .mask = BIT(0),
128                 .num_adr = ARRAY_SIZE(rt711_0_    117                 .num_adr = ARRAY_SIZE(rt711_0_adr),
129                 .adr_d = rt711_0_adr,             118                 .adr_d = rt711_0_adr,
130         },                                        119         },
131         {                                         120         {
132                 .mask = BIT(1),                   121                 .mask = BIT(1),
133                 .num_adr = ARRAY_SIZE(rt1308_1    122                 .num_adr = ARRAY_SIZE(rt1308_1_group1_adr),
134                 .adr_d = rt1308_1_group1_adr,     123                 .adr_d = rt1308_1_group1_adr,
135         },                                        124         },
136         {                                         125         {
137                 .mask = BIT(2),                   126                 .mask = BIT(2),
138                 .num_adr = ARRAY_SIZE(rt1308_2    127                 .num_adr = ARRAY_SIZE(rt1308_2_group1_adr),
139                 .adr_d = rt1308_2_group1_adr,     128                 .adr_d = rt1308_2_group1_adr,
140         },                                        129         },
141         {                                         130         {
142                 .mask = BIT(3),                   131                 .mask = BIT(3),
143                 .num_adr = ARRAY_SIZE(rt715_3_    132                 .num_adr = ARRAY_SIZE(rt715_3_adr),
144                 .adr_d = rt715_3_adr,             133                 .adr_d = rt715_3_adr,
145         },                                        134         },
146         {}                                        135         {}
147 };                                                136 };
148                                                   137 
149 static const struct snd_soc_acpi_link_adr icl_    138 static const struct snd_soc_acpi_link_adr icl_3_in_1_mono_amp[] = {
150         {                                         139         {
151                 .mask = BIT(0),                   140                 .mask = BIT(0),
152                 .num_adr = ARRAY_SIZE(rt711_0_    141                 .num_adr = ARRAY_SIZE(rt711_0_adr),
153                 .adr_d = rt711_0_adr,             142                 .adr_d = rt711_0_adr,
154         },                                        143         },
155         {                                         144         {
156                 .mask = BIT(1),                   145                 .mask = BIT(1),
157                 .num_adr = ARRAY_SIZE(rt1308_1    146                 .num_adr = ARRAY_SIZE(rt1308_1_adr),
158                 .adr_d = rt1308_1_adr,            147                 .adr_d = rt1308_1_adr,
159         },                                        148         },
160         {                                         149         {
161                 .mask = BIT(3),                   150                 .mask = BIT(3),
162                 .num_adr = ARRAY_SIZE(rt715_3_    151                 .num_adr = ARRAY_SIZE(rt715_3_adr),
163                 .adr_d = rt715_3_adr,             152                 .adr_d = rt715_3_adr,
164         },                                        153         },
165         {}                                        154         {}
166 };                                                155 };
167                                                   156 
168 struct snd_soc_acpi_mach snd_soc_acpi_intel_ic    157 struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[] = {
169         {                                         158         {
170                 .link_mask = 0xF, /* 4 active     159                 .link_mask = 0xF, /* 4 active links required */
171                 .links = icl_3_in_1_default,      160                 .links = icl_3_in_1_default,
172                 .drv_name = "sof_sdw",            161                 .drv_name = "sof_sdw",
                                                   >> 162                 .sof_fw_filename = "sof-icl.ri",
173                 .sof_tplg_filename = "sof-icl-    163                 .sof_tplg_filename = "sof-icl-rt711-rt1308-rt715.tplg",
174         },                                        164         },
175         {                                         165         {
176                 .link_mask = 0xB, /* 3 active     166                 .link_mask = 0xB, /* 3 active links required */
177                 .links = icl_3_in_1_mono_amp,     167                 .links = icl_3_in_1_mono_amp,
178                 .drv_name = "sof_sdw",            168                 .drv_name = "sof_sdw",
                                                   >> 169                 .sof_fw_filename = "sof-icl.ri",
179                 .sof_tplg_filename = "sof-icl-    170                 .sof_tplg_filename = "sof-icl-rt711-rt1308-rt715-mono.tplg",
180         },                                        171         },
181         {                                         172         {
182                 .link_mask = 0x1, /* rt700 con    173                 .link_mask = 0x1, /* rt700 connected on link0 */
183                 .links = icl_rvp,                 174                 .links = icl_rvp,
184                 .drv_name = "sof_sdw",            175                 .drv_name = "sof_sdw",
                                                   >> 176                 .sof_fw_filename = "sof-icl.ri",
185                 .sof_tplg_filename = "sof-icl-    177                 .sof_tplg_filename = "sof-icl-rt700.tplg",
186         },                                        178         },
187         {},                                       179         {},
188 };                                                180 };
189 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_sdw_m    181 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_sdw_machines);
                                                   >> 182 
                                                   >> 183 MODULE_LICENSE("GPL v2");
                                                   >> 184 MODULE_DESCRIPTION("Intel Common ACPI Match module");
190                                                   185 

~ [ 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