diff options
| author | Terry Cheong <htcheong@chromium.org> | 2023-10-19 12:34:06 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-19 19:00:17 +0100 |
| commit | 5c072ca8e1b7545b280d5416ecef77e3b0891a2c (patch) | |
| tree | 9b6120a96f9615b7ed0e3da7fed0c6cd707a1446 /sound | |
| parent | 10626812b5987b3a05adf6b4f4417e7398b7047c (diff) | |
ASoC: Intel: sof_nau8825: add RPL support for MAX98360A amp
Adding support back to RPL devices that lost audio after the RPL/ADL
split. The hardware configuration is:
SSP0: NAU88L25/NAU88L25YGB codec
SSP1: MAX98360A amplifier
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Terry Cheong <htcheong@chromium.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231019173411.166759-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/sof_nau8825.c | 8 | ||||
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 116281262859..44f5c359ae95 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -554,6 +554,14 @@ static const struct platform_device_id board_ids[] = { SOF_SSP_BT_OFFLOAD_PRESENT), }, { + .name = "rpl_mx98360a_8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, + { .name = "rpl_nau8318_8825", .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | SOF_NAU8825_SSP_AMP(1) | diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 19cfdcdbfdf7..5b6f57e3a583 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -409,6 +409,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { }, { .id = "10508825", + .drv_name = "rpl_mx98360a_8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rpl_max98360a_amp, + .sof_tplg_filename = "sof-rpl-max98360a-nau8825.tplg", + }, + { + .id = "10508825", .drv_name = "rpl_nau8318_8825", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &rpl_nau8318_amp, |