Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Intel: Add rpl_nau8318_8825 driver
Boards were using this in older kernels before adl and rpl ids were
split. Add this back to maintain support.
Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230804085648.3721416-1-ajye_huang@compal.corp-partner.google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Ajye Huang
and committed by
Mark Brown
273bc8bf
56f6ee6d
+22
+10
sound/soc/intel/boards/sof_nau8825.c
+10
sound/soc/intel/boards/sof_nau8825.c
···
684
684
SOF_BT_OFFLOAD_SSP(2) |
685
685
SOF_SSP_BT_OFFLOAD_PRESENT),
686
686
},
687
+
{
688
+
.name = "rpl_nau8318_8825",
689
+
.driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
690
+
SOF_SPEAKER_AMP_PRESENT |
691
+
SOF_NAU8318_SPEAKER_AMP_PRESENT |
692
+
SOF_NAU8825_SSP_AMP(1) |
693
+
SOF_NAU8825_NUM_HDMIDEV(4) |
694
+
SOF_BT_OFFLOAD_SSP(2) |
695
+
SOF_SSP_BT_OFFLOAD_PRESENT),
696
+
},
687
697
{ }
688
698
};
689
699
MODULE_DEVICE_TABLE(platform, board_ids);
+12
sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+12
sound/soc/intel/common/soc-acpi-intel-rpl-match.c
···
351
351
.codecs = {"RTL1019"}
352
352
};
353
353
354
+
static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
355
+
.num_codecs = 1,
356
+
.codecs = {"NVTN2012"}
357
+
};
358
+
354
359
struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
355
360
{
356
361
.comp_ids = &rpl_rt5682_hp,
···
377
372
.machine_quirk = snd_soc_acpi_codec_list,
378
373
.quirk_data = &rpl_max98373_amp,
379
374
.sof_tplg_filename = "sof-rpl-max98373-nau8825.tplg",
375
+
},
376
+
{
377
+
.id = "10508825",
378
+
.drv_name = "rpl_nau8318_8825",
379
+
.machine_quirk = snd_soc_acpi_codec_list,
380
+
.quirk_data = &rpl_nau8318_amp,
381
+
.sof_tplg_filename = "sof-rpl-nau8318-nau8825.tplg",
380
382
},
381
383
{
382
384
.comp_ids = &rpl_rt5682_hp,