On 8/4/23 03:56, Ajye Huang wrote:
> 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 <[email protected]>
Sorry, missed this.
Acked-by: Pierre-Louis Bossart <[email protected]>
> ---
> sound/soc/intel/boards/sof_nau8825.c | 10 ++++++++++
> sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 12 ++++++++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
> index 4fc6e1c6aef3..46b7ecf6f9f1 100644
> --- a/sound/soc/intel/boards/sof_nau8825.c
> +++ b/sound/soc/intel/boards/sof_nau8825.c
> @@ -684,6 +684,16 @@ static const struct platform_device_id board_ids[] = {
> 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_SPEAKER_AMP_PRESENT |
> + SOF_NAU8318_SPEAKER_AMP_PRESENT |
> + SOF_NAU8825_SSP_AMP(1) |
> + SOF_NAU8825_NUM_HDMIDEV(4) |
> + SOF_BT_OFFLOAD_SSP(2) |
> + SOF_SSP_BT_OFFLOAD_PRESENT),
> + },
> { }
> };
> MODULE_DEVICE_TABLE(platform, board_ids);
> 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 4eefdb2dd45c..1dd699181765 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
> @@ -351,6 +351,11 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {
> .codecs = {"RTL1019"}
> };
>
> +static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
> + .num_codecs = 1,
> + .codecs = {"NVTN2012"}
> +};
> +
> struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
> {
> .comp_ids = &rpl_rt5682_hp,
> @@ -373,6 +378,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
> .quirk_data = &rpl_max98373_amp,
> .sof_tplg_filename = "sof-rpl-max98373-nau8825.tplg",
> },
> + {
> + .id = "10508825",
> + .drv_name = "rpl_nau8318_8825",
> + .machine_quirk = snd_soc_acpi_codec_list,
> + .quirk_data = &rpl_nau8318_amp,
> + .sof_tplg_filename = "sof-rpl-nau8318-nau8825.tplg",
> + },
> {
> .comp_ids = &rpl_rt5682_hp,
> .drv_name = "rpl_rt1019_rt5682",