On 8/3/21 3:30 AM, Malik_Hsu wrote:
missing commit message?
> Signed-off-by: Malik_Hsu <malik_hsu@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
> sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index 39217223d50c..8d727dd37f12 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -1043,6 +1043,15 @@ static const struct platform_device_id board_ids[] = {
> SOF_RT5682_SSP_AMP(2) |
> SOF_RT5682_NUM_HDMIDEV(4)),
> },
> + {
> + .name = "adl_max98360a_rt5682",
> + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
> + SOF_RT5682_SSP_CODEC(0) |
> + SOF_SPEAKER_AMP_PRESENT |
> + SOF_RT5682_SSP_AMP(2) |
> + SOF_MAX98360A_SPEAKER_AMP_PRESENT |
> + SOF_RT5682_NUM_HDMIDEV(4)),
Can you clarify why BT offload is missing?
if it's supported in hardware, it doesn't hurt to add a capability in
the machine driver, you can always disable it in the topology file.
> + },
> { }
> };
> MODULE_DEVICE_TABLE(platform, board_ids);
> diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> index a0f6a69c7038..6855c9e65236 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> @@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
> .codecs = {"MX98357A"}
> };
>
> +static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
> + .num_codecs = 1,
> + .codecs = {"MX98360A"}
> +};
> +
> struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
> {
> .id = "10EC5682",
> @@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
> .sof_fw_filename = "sof-adl.ri",
> .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
> },
> + {
> + .id = "10EC5682",
> + .drv_name = "adl_max98360a_rt5682",
> + .machine_quirk = snd_soc_acpi_codec_list,
> + .quirk_data = &adl_max98360a_amp,
> + .sof_fw_filename = "sof-adl.ri",
> + .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
> + },
> {},
> };
> EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
>
