queue-6.8/asoc-intel-avs-populate-board-selection-with-new-i2s.patch

   1 From e99c9edacf22ab34de723ef6db71e0a4a9156bc4 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Tue, 20 Feb 2024 12:50:35 +0100
   4 Subject: ASoC: Intel: avs: Populate board selection with new I2S entries
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Cezary Rojewski <cezary.rojewski@intel.com>
  10
  11 [ Upstream commit 5b417fe0cded0b5917683398e6519aae8045cd40 ]
  12
  13 Update board selection with tables specifying supported I2S
  14 configurations. DMIC/HDAudio board selection require no update as
  15 dmic/hdaudio machine boards are generic and not tied to any specific
  16 codec.
  17
  18 Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
  19 Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
  20 Link: https://msgid.link/r/20240220115035.770402-11-cezary.rojewski@intel.com
  21 Signed-off-by: Mark Brown <broonie@kernel.org>
  22 Signed-off-by: Sasha Levin <sashal@kernel.org>
  23 ---
  24  sound/soc/intel/avs/board_selection.c | 85 +++++++++++++++++++++++++++
  25  1 file changed, 85 insertions(+)
  26
  27 diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
  28 index 8e91eece992db..8360ce557401c 100644
  29 --- a/sound/soc/intel/avs/board_selection.c
  30 +++ b/sound/soc/intel/avs/board_selection.c
  31 @@ -236,6 +236,82 @@ static struct snd_soc_acpi_mach avs_gml_i2s_machines[] = {
  32         {},
  33  };
  34
  35 +static struct snd_soc_acpi_mach avs_cnl_i2s_machines[] = {
  36 +       {
  37 +               .id = "INT34C2",
  38 +               .drv_name = "avs_rt274",
  39 +               .mach_params = {
  40 +                       .i2s_link_mask = AVS_SSP(0),
  41 +               },
  42 +               .tplg_filename = "rt274-tplg.bin",
  43 +       },
  44 +       {
  45 +               .id = "10EC5682",
  46 +               .drv_name = "avs_rt5682",
  47 +               .mach_params = {
  48 +                       .i2s_link_mask = AVS_SSP(1),
  49 +               },
  50 +               .tplg_filename = "rt5682-tplg.bin",
  51 +       },
  52 +       {},
  53 +};
  54 +
  55 +static struct snd_soc_acpi_mach avs_icl_i2s_machines[] = {
  56 +       {
  57 +               .id = "INT343A",
  58 +               .drv_name = "avs_rt298",
  59 +               .mach_params = {
  60 +                       .i2s_link_mask = AVS_SSP(0),
  61 +               },
  62 +               .tplg_filename = "rt298-tplg.bin",
  63 +       },
  64 +       {
  65 +               .id = "INT34C2",
  66 +               .drv_name = "avs_rt274",
  67 +               .mach_params = {
  68 +                       .i2s_link_mask = AVS_SSP(0),
  69 +               },
  70 +               .tplg_filename = "rt274-tplg.bin",
  71 +       },
  72 +       {},
  73 +};
  74 +
  75 +static struct snd_soc_acpi_mach avs_tgl_i2s_machines[] = {
  76 +       {
  77 +               .id = "INT34C2",
  78 +               .drv_name = "avs_rt274",
  79 +               .mach_params = {
  80 +                       .i2s_link_mask = AVS_SSP(0),
  81 +               },
  82 +               .tplg_filename = "rt274-tplg.bin",
  83 +       },
  84 +       {
  85 +               .id = "10EC0298",
  86 +               .drv_name = "avs_rt298",
  87 +               .mach_params = {
  88 +                       .i2s_link_mask = AVS_SSP(0),
  89 +               },
  90 +               .tplg_filename = "rt298-tplg.bin",
  91 +       },
  92 +       {
  93 +               .id = "10EC1308",
  94 +               .drv_name = "avs_rt1308",
  95 +               .mach_params = {
  96 +                       .i2s_link_mask = AVS_SSP(1),
  97 +               },
  98 +               .tplg_filename = "rt1308-tplg.bin",
  99 +       },
 100 +       {
 101 +               .id = "ESSX8336",
 102 +               .drv_name = "avs_es8336",
 103 +               .mach_params = {
 104 +                       .i2s_link_mask = AVS_SSP(0),
 105 +               },
 106 +               .tplg_filename = "es8336-tplg.bin",
 107 +       },
 108 +       {},
 109 +};
 110 +
 111  static struct snd_soc_acpi_mach avs_test_i2s_machines[] = {
 112         {
 113                 .drv_name = "avs_i2s_test",
 114 @@ -296,6 +372,15 @@ static const struct avs_acpi_boards i2s_boards[] = {
 115         AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
 116         AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
 117         AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),
 118 +       AVS_MACH_ENTRY(HDA_CNL_LP,      avs_cnl_i2s_machines),
 119 +       AVS_MACH_ENTRY(HDA_CNL_H,       avs_cnl_i2s_machines),
 120 +       AVS_MACH_ENTRY(HDA_CML_LP,      avs_cnl_i2s_machines),
 121 +       AVS_MACH_ENTRY(HDA_ICL_LP,      avs_icl_i2s_machines),
 122 +       AVS_MACH_ENTRY(HDA_TGL_LP,      avs_tgl_i2s_machines),
 123 +       AVS_MACH_ENTRY(HDA_EHL_0,       avs_tgl_i2s_machines),
 124 +       AVS_MACH_ENTRY(HDA_ADL_P,       avs_tgl_i2s_machines),
 125 +       AVS_MACH_ENTRY(HDA_RPL_P_0,     avs_tgl_i2s_machines),
 126 +       AVS_MACH_ENTRY(HDA_RPL_M,       avs_tgl_i2s_machines),
 127         {},
 128  };
 129
 130 --
 131 2.43.0
 132