| From 49a9d80bba6a27d2fab95d855260293f68756096 Mon Sep 17 00:00:00 2001 |
| From: Mark Hsieh <mark_hsieh@wistron.corp-partner.google.com> |
| Date: Thu, 26 Aug 2021 18:30:32 +0800 |
| Subject: [PATCH] BACKPORT: FROMLIST: ASoC: Intel: sof_rt5682: Add support for |
| max98390 speaker amp |
| |
| Configure adl_max98390_rt5682 to support the rt5682 headset codec |
| and max98390 speaker. |
| |
| Signed-off-by: Mark Hsieh <mark_hsieh@wistron.corp-partner.google.com> |
| (am from https://patches.linaro.org/patch/502923/) |
| (also found at https://lore.kernel.org/r/20210826103032.22262-1-mark_hsieh@wistron.corp-partner.google.com) |
| |
| BUG=b:191811888 |
| TEST=emerge-brya chromeos-kernel-5_10 |
| |
| Change-Id: I953272f093de4cfed93f3ed6c8980e1d88b33dca |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3122915 |
| Tested-by: Mark Hsieh <mark_hsieh@wistron.corp-partner.google.com> |
| Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> |
| Reviewed-by: Mac Chiang <mac.chiang@intel.com> |
| Commit-Queue: Curtis Malainey <cujomalainey@chromium.org> |
| --- |
| sound/soc/intel/boards/Kconfig | 1 + |
| sound/soc/intel/boards/sof_maxim_common.c | 57 +++++++++++++++++++ |
| sound/soc/intel/boards/sof_maxim_common.h | 12 ++++ |
| sound/soc/intel/boards/sof_rt5682.c | 19 +++++++ |
| .../intel/common/soc-acpi-intel-adl-match.c | 13 +++++ |
| 5 files changed, 102 insertions(+) |
| |
| diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig |
| --- a/sound/soc/intel/boards/Kconfig |
| +++ b/sound/soc/intel/boards/Kconfig |
| @@ -470,6 +470,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH |
| select SND_SOC_RT1015 |
| select SND_SOC_RT1015P |
| select SND_SOC_RT5682_I2C |
| + select SND_SOC_MAX98390 |
| select SND_SOC_DMIC |
| select SND_SOC_HDAC_HDMI |
| select SND_SOC_INTEL_HDA_DSP_COMMON |
| diff --git a/sound/soc/intel/boards/sof_maxim_common.c b/sound/soc/intel/boards/sof_maxim_common.c |
| --- a/sound/soc/intel/boards/sof_maxim_common.c |
| +++ b/sound/soc/intel/boards/sof_maxim_common.c |
| @@ -133,6 +133,63 @@ void max_98373_set_codec_conf(struct snd_soc_card *card) |
| } |
| EXPORT_SYMBOL_NS(max_98373_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON); |
| |
| +/* |
| + * Maxim MAX98390 |
| + */ |
| + |
| +static struct snd_soc_codec_conf max_98390_codec_conf[] = { |
| + { |
| + .dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME), |
| + .name_prefix = "Right", |
| + }, |
| + { |
| + .dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME), |
| + .name_prefix = "Left", |
| + }, |
| +}; |
| + |
| +struct snd_soc_dai_link_component max_98390_components[] = { |
| + { /* For Right */ |
| + .name = MAX_98390_DEV0_NAME, |
| + .dai_name = MAX_98390_CODEC_DAI, |
| + }, |
| + { /* For Left */ |
| + .name = MAX_98390_DEV1_NAME, |
| + .dai_name = MAX_98390_CODEC_DAI, |
| + }, |
| +}; |
| +EXPORT_SYMBOL_NS(max_98390_components, SND_SOC_INTEL_SOF_MAXIM_COMMON); |
| + |
| +static int max_98390_hw_params(struct snd_pcm_substream *substream, |
| + struct snd_pcm_hw_params *params) |
| +{ |
| + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); |
| + struct snd_soc_dai *codec_dai; |
| + int i; |
| + |
| + for_each_rtd_codec_dais(rtd, i, codec_dai) { |
| + /* DEV0 tdm slot configuration */ |
| + if (!strcmp(codec_dai->component->name, MAX_98390_DEV0_NAME)) |
| + snd_soc_dai_set_tdm_slot(codec_dai, 0x03, 3, 2, 16); |
| + /* DEV1 tdm slot configuration */ |
| + if (!strcmp(codec_dai->component->name, MAX_98390_DEV1_NAME)) |
| + snd_soc_dai_set_tdm_slot(codec_dai, 0x0C, 3, 2, 16); |
| + } |
| + return 0; |
| +} |
| + |
| +const struct snd_soc_ops max_98390_ops = { |
| + .hw_params = max_98390_hw_params, |
| +}; |
| +EXPORT_SYMBOL_NS(max_98390_ops, SND_SOC_INTEL_SOF_MAXIM_COMMON); |
| + |
| +void max_98390_set_codec_conf(struct snd_soc_card *card) |
| +{ |
| + card->codec_conf = max_98390_codec_conf; |
| + card->num_configs = ARRAY_SIZE(max_98390_codec_conf); |
| +} |
| +EXPORT_SYMBOL_NS(max_98390_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON); |
| + |
| /* |
| * Maxim MAX98357A/MAX98360A |
| */ |
| diff --git a/sound/soc/intel/boards/sof_maxim_common.h b/sound/soc/intel/boards/sof_maxim_common.h |
| --- a/sound/soc/intel/boards/sof_maxim_common.h |
| +++ b/sound/soc/intel/boards/sof_maxim_common.h |
| @@ -24,6 +24,18 @@ int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd); |
| void max_98373_set_codec_conf(struct snd_soc_card *card); |
| int max_98373_trigger(struct snd_pcm_substream *substream, int cmd); |
| |
| +/* |
| + * Maxim MAX98390 |
| + */ |
| +#define MAX_98390_CODEC_DAI "max98390-aif1" |
| +#define MAX_98390_DEV0_NAME "i2c-MX98390:00" |
| +#define MAX_98390_DEV1_NAME "i2c-MX98390:01" |
| + |
| +extern struct snd_soc_dai_link_component max_98390_components[2]; |
| +extern const struct snd_soc_ops max_98390_ops; |
| + |
| +void max_98390_set_codec_conf(struct snd_soc_card *card); |
| + |
| /* |
| * Maxim MAX98357A/MAX98360A |
| */ |
| diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c |
| --- a/sound/soc/intel/boards/sof_rt5682.c |
| +++ b/sound/soc/intel/boards/sof_rt5682.c |
| @@ -49,6 +49,7 @@ |
| #define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(16) |
| #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(17) |
| #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(18) |
| +#define SOF_MAX98390_SPEAKER_AMP_PRESENT BIT(23) |
| |
| /* BT audio offload: reserve 3 bits for future */ |
| #define SOF_BT_OFFLOAD_SSP_SHIFT 19 |
| @@ -745,6 +746,13 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, |
| } else if (sof_rt5682_quirk & |
| SOF_RT1011_SPEAKER_AMP_PRESENT) { |
| sof_rt1011_dai_link(&links[id]); |
| + } else if (sof_rt5682_quirk & |
| + SOF_MAX98390_SPEAKER_AMP_PRESENT) { |
| + links[id].codecs = max_98390_components; |
| + links[id].num_codecs = ARRAY_SIZE(max_98390_components); |
| + links[id].init = max_98373_spk_codec_init; |
| + links[id].ops = &max_98390_ops; |
| + links[id].dpcm_capture = 1; |
| } else { |
| max_98357a_dai_link(&links[id]); |
| } |
| @@ -881,6 +889,8 @@ static int sof_audio_probe(struct platform_device *pdev) |
| sof_rt1011_codec_conf(&sof_audio_card_rt5682); |
| else if (sof_rt5682_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) |
| sof_rt1015p_codec_conf(&sof_audio_card_rt5682); |
| + else if (sof_rt5682_quirk & SOF_MAX98390_SPEAKER_AMP_PRESENT) |
| + max_98390_set_codec_conf(&sof_audio_card_rt5682); |
| |
| if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) |
| sof_audio_card_rt5682.num_links++; |
| @@ -1007,6 +1017,15 @@ static const struct platform_device_id board_ids[] = { |
| SOF_RT5682_SSP_AMP(2) | |
| SOF_RT5682_NUM_HDMIDEV(4)), |
| }, |
| + { |
| + .name = "adl_max98390_rt5682", |
| + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | |
| + SOF_RT5682_SSP_CODEC(0) | |
| + SOF_SPEAKER_AMP_PRESENT | |
| + SOF_MAX98390_SPEAKER_AMP_PRESENT | |
| + SOF_RT5682_SSP_AMP(2) | |
| + SOF_RT5682_NUM_HDMIDEV(4)), |
| + }, |
| { } |
| }; |
| 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 |
| --- 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_max98390_amp = { |
| + .num_codecs = 1, |
| + .codecs = {"MX98390"} |
| +}; |
| + |
| 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_max98390_rt5682", |
| + .machine_quirk = snd_soc_acpi_codec_list, |
| + .quirk_data = &adl_max98390_amp, |
| + .sof_fw_filename = "sof-adl.ri", |
| + .sof_tplg_filename = "sof-adl-max98390-rt5682.tplg", |
| + }, |
| {}, |
| }; |
| EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines); |
| -- |
| 2.33.0.464.g1972c5931b-goog |
| |