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

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


  1 // SPDX-License-Identifier: GPL-2.0-only            1 // SPDX-License-Identifier: GPL-2.0-only
  2 /*                                                  2 /*
  3  * soc-acpi-intel-cnl-match.c - tables and sup      3  * soc-acpi-intel-cnl-match.c - tables and support for CNL 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 #include "soc-acpi-intel-sdw-mockup-match.h"       12 #include "soc-acpi-intel-sdw-mockup-match.h"
 12                                                    13 
 13 static const struct snd_soc_acpi_codecs essx_8 !!  14 static struct skl_machine_pdata cnl_pdata = {
 14         .num_codecs = 3,                       !!  15         .use_tplg_pcm = true,
 15         .codecs = { "ESSX8316", "ESSX8326", "E << 
 16 };                                                 16 };
 17                                                    17 
 18 struct snd_soc_acpi_mach snd_soc_acpi_intel_cn     18 struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
 19         {                                          19         {
 20                 .id = "INT34C2",                   20                 .id = "INT34C2",
 21                 .drv_name = "cnl_rt274",           21                 .drv_name = "cnl_rt274",
 22                 .fw_filename = "intel/dsp_fw_c     22                 .fw_filename = "intel/dsp_fw_cnl.bin",
                                                   >>  23                 .pdata = &cnl_pdata,
                                                   >>  24                 .sof_fw_filename = "sof-cnl.ri",
 23                 .sof_tplg_filename = "sof-cnl-     25                 .sof_tplg_filename = "sof-cnl-rt274.tplg",
 24         },                                         26         },
 25         {                                      << 
 26                 .comp_ids = &essx_83x6,        << 
 27                 .drv_name = "sof-essx8336",    << 
 28                 /* cnl and cml are identical * << 
 29                 .sof_tplg_filename = "sof-cml- << 
 30                 .tplg_quirk_mask = SND_SOC_ACP << 
 31                                         SND_SO << 
 32                                         SND_SO << 
 33         },                                     << 
 34         {},                                        27         {},
 35 };                                                 28 };
 36 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_machi     29 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_machines);
 37                                                    30 
 38 static const struct snd_soc_acpi_endpoint sing     31 static const struct snd_soc_acpi_endpoint single_endpoint = {
 39         .num = 0,                                  32         .num = 0,
 40         .aggregated = 0,                           33         .aggregated = 0,
 41         .group_position = 0,                       34         .group_position = 0,
 42         .group_id = 0,                             35         .group_id = 0,
 43 };                                                 36 };
 44                                                    37 
 45 static const struct snd_soc_acpi_adr_device rt     38 static const struct snd_soc_acpi_adr_device rt5682_2_adr[] = {
 46         {                                          39         {
 47                 .adr = 0x000220025D568200ull,      40                 .adr = 0x000220025D568200ull,
 48                 .num_endpoints = 1,                41                 .num_endpoints = 1,
 49                 .endpoints = &single_endpoint,     42                 .endpoints = &single_endpoint,
 50                 .name_prefix = "rt5682"            43                 .name_prefix = "rt5682"
 51         }                                          44         }
 52 };                                                 45 };
 53                                                    46 
 54 static const struct snd_soc_acpi_link_adr up_e     47 static const struct snd_soc_acpi_link_adr up_extreme_rt5682_2[] = {
 55         {                                          48         {
 56                 .mask = BIT(2),                    49                 .mask = BIT(2),
 57                 .num_adr = ARRAY_SIZE(rt5682_2     50                 .num_adr = ARRAY_SIZE(rt5682_2_adr),
 58                 .adr_d = rt5682_2_adr,             51                 .adr_d = rt5682_2_adr,
 59         },                                         52         },
 60         {}                                         53         {}
 61 };                                                 54 };
 62                                                    55 
 63 struct snd_soc_acpi_mach snd_soc_acpi_intel_cn     56 struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[] = {
 64         {                                          57         {
 65                 .link_mask = BIT(2),               58                 .link_mask = BIT(2),
 66                 .links = up_extreme_rt5682_2,      59                 .links = up_extreme_rt5682_2,
 67                 .drv_name = "sof_sdw",             60                 .drv_name = "sof_sdw",
                                                   >>  61                 .sof_fw_filename = "sof-cnl.ri",
 68                 .sof_tplg_filename = "sof-cnl-     62                 .sof_tplg_filename = "sof-cnl-rt5682-sdw2.tplg"
 69         },                                         63         },
 70         {                                          64         {
 71                 .link_mask = GENMASK(3, 0),        65                 .link_mask = GENMASK(3, 0),
 72                 .links = sdw_mockup_headset_2a     66                 .links = sdw_mockup_headset_2amps_mic,
 73                 .drv_name = "sof_sdw",             67                 .drv_name = "sof_sdw",
                                                   >>  68                 .sof_fw_filename = "sof-cnl.ri",
 74                 .sof_tplg_filename = "sof-cml-     69                 .sof_tplg_filename = "sof-cml-rt711-rt1308-rt715.tplg",
 75         },                                         70         },
 76         {                                          71         {
 77                 .link_mask = BIT(0) | BIT(1) |     72                 .link_mask = BIT(0) | BIT(1) | BIT(3),
 78                 .links = sdw_mockup_headset_1a     73                 .links = sdw_mockup_headset_1amp_mic,
 79                 .drv_name = "sof_sdw",             74                 .drv_name = "sof_sdw",
                                                   >>  75                 .sof_fw_filename = "sof-cnl.ri",
 80                 .sof_tplg_filename = "sof-cml-     76                 .sof_tplg_filename = "sof-cml-rt711-rt1308-mono-rt715.tplg",
 81         },                                         77         },
 82         {}                                         78         {}
 83 };                                                 79 };
 84 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_sdw_m     80 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cnl_sdw_machines);
 85                                                    81 

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