| Message ID | 20211001150316.414141-1-brent.lu@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c892547624ff277546a9d4fede3d95259e6faea |
| Headers | show |
| Series | ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp | expand |
> > From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com> > > Add a board config adl_mx98360a_rt5682 to support alc5682 headset codec > and max98360a speaker amplifier. Follow Intel BT offload design by > connecting alc5682 to SSP0 and max98360a to SSP1. > > Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com> > Signed-off-by: Brent Lu <brent.lu@intel.com> Already accepted on SOF github. Merged with another fixup patch for the platform device name.
On 10/1/21 10:07 AM, Lu, Brent wrote: >> >> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com> >> >> Add a board config adl_mx98360a_rt5682 to support alc5682 headset codec >> and max98360a speaker amplifier. Follow Intel BT offload design by >> connecting alc5682 to SSP0 and max98360a to SSP1. >> >> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com> >> Signed-off-by: Brent Lu <brent.lu@intel.com> > > Already accepted on SOF github. Merged with another fixup patch for the > platform device name. Yes this was reviewed by Bard and me on GitHub. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
On Fri, 1 Oct 2021 23:03:16 +0800, Brent Lu wrote: > From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com> > > Add a board config adl_mx98360a_rt5682 to support alc5682 headset > codec and max98360a speaker amplifier. Follow Intel BT offload design > by connecting alc5682 to SSP0 and max98360a to SSP1. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp commit: 9c892547624ff277546a9d4fede3d95259e6faea All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index ad42d4c7ade5..613662eedd0d 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1076,6 +1076,17 @@ static const struct platform_device_id board_ids[] = { SOF_MAX98360A_SPEAKER_AMP_PRESENT | SOF_RT5682_SSP_AMP(1)), }, + { + .name = "adl_mx98360_rt5682", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | + SOF_RT5682_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_MAX98360A_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1) | + SOF_RT5682_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-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index e4ff280eac23..f5b21a95d222 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_mx98360_rt5682", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_max98360a_amp, + .sof_fw_filename = "sof-adl.ri", + .sof_tplg_filename = "sof-adl-max98360a-rt5682.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);