| Message ID | 20210913100026.19393-1-mac.chiang@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] ASoC: Intel: boards: add max98390 2/4 speakers support | expand |
I don't quite follow the initialization part. In the 4-ch case, you will setup control and widgets but... > +int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd) > +{ > + struct snd_soc_card *card = rtd->card; > + int ret; > + > + ret = snd_soc_dapm_new_controls(&card->dapm, max_98390_tt_dapm_widgets, > + ARRAY_SIZE(max_98390_tt_dapm_widgets)); > + if (ret) { > + dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret); > + /* Don't need to add routes if widget addition failed */ > + return ret; > + } > + > + ret = snd_soc_add_card_controls(card, max_98390_tt_kcontrols, > + ARRAY_SIZE(max_98390_tt_kcontrols)); > + if (ret) { > + dev_err(rtd->dev, "unable to add card controls, ret %d\n", ret); > + return ret; > + } > + > + ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, > + ARRAY_SIZE(max_98373_dapm_routes)); > + if (ret) { > + dev_err(rtd->dev, "Speaker Left, Right map addition failed: %d\n", ret); > + return ret; > + } > + > + ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_tt_dapm_routes, > + ARRAY_SIZE(max_98390_tt_dapm_routes)); > + if (ret) > + dev_err(rtd->dev, "Tweeter Speaker Left, Right map addition failed: %d\n", ret); > + > + return ret; > +} > +EXPORT_SYMBOL_NS(max_98390_spk_codec_init, SND_SOC_INTEL_SOF_MAXIM_COMMON); > @@ -745,6 +778,21 @@ 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) { > + if (sof_rt5682_quirk & > + SOF_MAX98390_TWEETER_SPEAKER_PRESENT) { > + links[id].codecs = max_98390_4spk_components; > + links[id].num_codecs = ARRAY_SIZE(max_98390_4spk_components); > + links[id].init = max_98390_spk_codec_init; > + } else { > + links[id].codecs = max_98390_components; > + links[id].num_codecs = ARRAY_SIZE(max_98390_components); > + links[id].init = max_98373_spk_codec_init; > + } ... in the 2 ch case you use this function int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; int ret; ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, ARRAY_SIZE(max_98373_dapm_routes)); if (ret) dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret); return ret; } which only adds routes. Isn't there a need for widgets/controls for the 2 channel case as well? It's also not good practice to mix the initialization of max98090 with a function with an explicit 98373 prefix. it's hard to maintain and error-prone. You might as well duplicate the function, if it's not used it will be removed while linking. > + links[id].ops = &max_98390_ops; > + links[id].dpcm_capture = 1; > + > } else { > max_98357a_dai_link(&links[id]); > } > @@ -881,6 +929,14 @@ 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) { > + if (sof_rt5682_quirk & SOF_MAX98390_TWEETER_SPEAKER_PRESENT) > + max_98390_set_codec_conf(&sof_audio_card_rt5682, > + ARRAY_SIZE(max_98390_4spk_components)); > + else > + max_98390_set_codec_conf(&sof_audio_card_rt5682, > + ARRAY_SIZE(max_98390_components)); > + } > > if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) > sof_audio_card_rt5682.num_links++; > @@ -1007,6 +1063,18 @@ 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(1) | > + SOF_RT5682_NUM_HDMIDEV(4) | > + SOF_BT_OFFLOAD_SSP(2) | > + SOF_SSP_BT_OFFLOAD_PRESENT), > + }, > + > { } > }; > MODULE_DEVICE_TABLE(platform, board_ids); > @@ -1026,6 +1094,7 @@ MODULE_DESCRIPTION("SOF Audio Machine driver"); > MODULE_AUTHOR("Bard Liao <bard.liao@intel.com>"); > MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>"); > MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>"); > +MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>"); > MODULE_LICENSE("GPL v2"); > MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON); > MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON); > 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..2db152998e4a 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_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); > diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c > index bc9e70765678..be90a5f79766 100644 > --- a/sound/soc/sof/sof-pci-dev.c > +++ b/sound/soc/sof/sof-pci-dev.c > @@ -59,6 +59,15 @@ static const struct dmi_system_id sof_tplg_table[] = { > }, > .driver_data = "sof-adl-rt5682-ssp0-max98373-ssp2.tplg", > }, > + { > + .callback = sof_tplg_cb, > + .matches = { > + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), > + DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S"), > + }, > + .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", > + }, > + I am still relatively confused since you still have two alternatives for topology but you described three configurations.
> I don't quite follow the initialization part. In the 4-ch case, you will setup > control and widgets but... > > > +int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd) { > > + struct snd_soc_card *card = rtd->card; > > + int ret; > > + > > + ret = snd_soc_dapm_new_controls(&card->dapm, > max_98390_tt_dapm_widgets, > > + > ARRAY_SIZE(max_98390_tt_dapm_widgets)); > > + if (ret) { > > + dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", > ret); > > + /* Don't need to add routes if widget addition failed */ > > + return ret; > > + } > > + > > + ret = snd_soc_add_card_controls(card, max_98390_tt_kcontrols, > > + > ARRAY_SIZE(max_98390_tt_kcontrols)); > > + if (ret) { > > + dev_err(rtd->dev, "unable to add card controls, ret %d\n", > ret); > > + return ret; > > + } > > + > > + ret = snd_soc_dapm_add_routes(&card->dapm, > max_98373_dapm_routes, > > + > ARRAY_SIZE(max_98373_dapm_routes)); > > + if (ret) { > > + dev_err(rtd->dev, "Speaker Left, Right map addition failed: > %d\n", ret); > > + return ret; > > + } > > + > > + ret = snd_soc_dapm_add_routes(&card->dapm, > max_98390_tt_dapm_routes, > > + > ARRAY_SIZE(max_98390_tt_dapm_routes)); > > + if (ret) > > + dev_err(rtd->dev, "Tweeter Speaker Left, Right map addition > failed: > > +%d\n", ret); > > + > > + return ret; > > +} > > +EXPORT_SYMBOL_NS(max_98390_spk_codec_init, > > +SND_SOC_INTEL_SOF_MAXIM_COMMON); > > > @@ -745,6 +778,21 @@ 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) { > > + if (sof_rt5682_quirk & > > + > SOF_MAX98390_TWEETER_SPEAKER_PRESENT) { > > + links[id].codecs = > max_98390_4spk_components; > > + links[id].num_codecs = > ARRAY_SIZE(max_98390_4spk_components); > > + links[id].init = max_98390_spk_codec_init; > > + } else { > > + links[id].codecs = max_98390_components; > > + links[id].num_codecs = > ARRAY_SIZE(max_98390_components); > > + links[id].init = max_98373_spk_codec_init; > > + } > > ... in the 2 ch case you use this function > > int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd) { > struct snd_soc_card *card = rtd->card; > int ret; > > ret = snd_soc_dapm_add_routes(&card->dapm, > max_98373_dapm_routes, > ARRAY_SIZE(max_98373_dapm_routes)); > if (ret) > dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret); > return ret; > } > > which only adds routes. Isn't there a need for widgets/controls for the > 2 channel case as well? 2 channels controls/widgets already exist in sof_controls[] and sof_widgets[] from sof_rt5682.c > > It's also not good practice to mix the initialization of max98090 with a > function with an explicit 98373 prefix. it's hard to maintain and error-prone. > You might as well duplicate the function, if it's not used it will be removed > while linking. I am not sure whether I understand your suggestions. When both using links[id].init = max_98390_spk_codec_init; I can only think out add 2 spk dapm initially then check if 4 codec existing by using acpi_dev_present with uid. If no good, any example I can refer to? int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd, int num_amps) { struct snd_soc_card *card = rtd->card; int ret; ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_dapm_routes, ARRAY_SIZE(max_98390_dapm_routes)); if (ret) dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret); if (acpi_dev_present("MX98390", "3", -1)) { ret = snd_soc_dapm_new_controls(&card->dapm, max_98390_tt_dapm_widgets, ARRAY_SIZE(max_98390_tt_dapm_widgets)); if (ret) { dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret); /* Don't need to add routes if widget addition failed */ return ret; } ret = snd_soc_add_card_controls(card, max_98390_tt_kcontrols, ARRAY_SIZE(max_98390_tt_kcontrols)); if (ret) { dev_err(rtd->dev, "unable to add card controls, ret %d\n", ret); return ret; } ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_tt_dapm_routes, ARRAY_SIZE(max_98390_tt_dapm_routes)); if (ret) dev_err(rtd->dev, "Tweeter Speaker Left, Right map addition failed: %d\n", ret); } return ret; } > > + links[id].ops = &max_98390_ops; > > + links[id].dpcm_capture = 1; > > + > > } else { > > max_98357a_dai_link(&links[id]); > > } > > @@ -881,6 +929,14 @@ 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) > { > > + if (sof_rt5682_quirk & > SOF_MAX98390_TWEETER_SPEAKER_PRESENT) > > + > max_98390_set_codec_conf(&sof_audio_card_rt5682, > > + > ARRAY_SIZE(max_98390_4spk_components)); > > + else > > + > max_98390_set_codec_conf(&sof_audio_card_rt5682, > > + > ARRAY_SIZE(max_98390_components)); > > + } > > > > if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) > > sof_audio_card_rt5682.num_links++; > > @@ -1007,6 +1063,18 @@ 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(1) | > > + SOF_RT5682_NUM_HDMIDEV(4) | > > + SOF_BT_OFFLOAD_SSP(2) | > > + SOF_SSP_BT_OFFLOAD_PRESENT), > > + }, > > + > > { } > > }; > > MODULE_DEVICE_TABLE(platform, board_ids); @@ -1026,6 +1094,7 @@ > > MODULE_DESCRIPTION("SOF Audio Machine driver"); > MODULE_AUTHOR("Bard > > Liao <bard.liao@intel.com>"); MODULE_AUTHOR("Sathya Prakash M R > > <sathya.prakash.m.r@intel.com>"); MODULE_AUTHOR("Brent Lu > > <brent.lu@intel.com>"); > > +MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>"); > > MODULE_LICENSE("GPL v2"); > > MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON); > > MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON); > > 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..2db152998e4a 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_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); > > diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c > > index bc9e70765678..be90a5f79766 100644 > > --- a/sound/soc/sof/sof-pci-dev.c > > +++ b/sound/soc/sof/sof-pci-dev.c > > @@ -59,6 +59,15 @@ static const struct dmi_system_id sof_tplg_table[] = > { > > }, > > .driver_data = "sof-adl-rt5682-ssp0-max98373-ssp2.tplg", > > }, > > + { > > + .callback = sof_tplg_cb, > > + .matches = { > > + DMI_MATCH(DMI_PRODUCT_FAMILY, > "Google_Brya"), > > + DMI_MATCH(DMI_OEM_STRING, "AUDIO- > MAX98390_ALC5682I_I2S"), > > + }, > > + .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", > > + }, > > + > > I am still relatively confused since you still have two alternatives for topology > but you described three configurations. 3rd hw board without quirk, so it is applying SSP1 2 speakers which declare in board_id[]. { .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(1) | SOF_RT5682_NUM_HDMIDEV(4) | SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), },
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 61b71d6c44cf..9723d04cbe74 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -466,6 +466,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH (MFD_INTEL_LPSS || COMPILE_TEST)) ||\ (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST)) select SND_SOC_MAX98373_I2C + select SND_SOC_MAX98390 select SND_SOC_RT1011 select SND_SOC_RT1015 select SND_SOC_RT1015P diff --git a/sound/soc/intel/boards/sof_maxim_common.c b/sound/soc/intel/boards/sof_maxim_common.c index e66dfe666915..eeaa96648c5a 100644 --- a/sound/soc/intel/boards/sof_maxim_common.c +++ b/sound/soc/intel/boards/sof_maxim_common.c @@ -133,6 +133,176 @@ 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 const struct snd_kcontrol_new max_98390_tt_kcontrols[] = { + SOC_DAPM_PIN_SWITCH("TL Spk"), + SOC_DAPM_PIN_SWITCH("TR Spk"), +}; + +static const struct snd_soc_dapm_widget max_98390_tt_dapm_widgets[] = { + SND_SOC_DAPM_SPK("TL Spk", NULL), + SND_SOC_DAPM_SPK("TR Spk", NULL), +}; + +const struct snd_soc_dapm_route max_98390_tt_dapm_routes[] = { + /* Tweeter speaker */ + { "TL Spk", NULL, "Tweeter Left BE_OUT" }, + { "TR Spk", NULL, "Tweeter Right BE_OUT" }, +}; +EXPORT_SYMBOL_NS(max_98390_tt_dapm_routes, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +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", + }, +}; + +static struct snd_soc_codec_conf max_98390_4spk_codec_conf[] = { + { + .dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME), + .name_prefix = "Right", + }, + { + .dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME), + .name_prefix = "Left", + }, + { + .dlc = COMP_CODEC_CONF(MAX_98390_DEV2_NAME), + .name_prefix = "Tweeter Right", + }, + { + .dlc = COMP_CODEC_CONF(MAX_98390_DEV3_NAME), + .name_prefix = "Tweeter Left", + }, +}; + +struct snd_soc_dai_link_component max_98390_components[] = { + { + .name = MAX_98390_DEV0_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, + { + .name = MAX_98390_DEV1_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, +}; +EXPORT_SYMBOL_NS(max_98390_components, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +struct snd_soc_dai_link_component max_98390_4spk_components[] = { + { + .name = MAX_98390_DEV0_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, + { + .name = MAX_98390_DEV1_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, + { + .name = MAX_98390_DEV2_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, + { + .name = MAX_98390_DEV3_NAME, + .dai_name = MAX_98390_CODEC_DAI, + }, +}; +EXPORT_SYMBOL_NS(max_98390_4spk_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) { + + if (i >= ARRAY_SIZE(max_98390_4spk_components)) { + dev_err(codec_dai->dev, "invalid codec index %d\n", i); + return -ENODEV; + } + + if (!strcmp(codec_dai->component->name, MAX_98390_DEV0_NAME)) { + /* DEV0 tdm slot configuration Right */ + snd_soc_dai_set_tdm_slot(codec_dai, 0x01, 3, 4, 32); + } + if (!strcmp(codec_dai->component->name, MAX_98390_DEV1_NAME)) { + /* DEV1 tdm slot configuration Left */ + snd_soc_dai_set_tdm_slot(codec_dai, 0x02, 3, 4, 32); + } + + if (!strcmp(codec_dai->component->name, MAX_98390_DEV2_NAME)) { + /* DEVi2 tdm slot configuration Tweeter Right */ + snd_soc_dai_set_tdm_slot(codec_dai, 0x04, 3, 4, 32); + } + if (!strcmp(codec_dai->component->name, MAX_98390_DEV3_NAME)) { + /* DEV3 tdm slot configuration Tweeter Left */ + snd_soc_dai_set_tdm_slot(codec_dai, 0x08, 3, 4, 32); + } + } + return 0; +} + +int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_card *card = rtd->card; + int ret; + + ret = snd_soc_dapm_new_controls(&card->dapm, max_98390_tt_dapm_widgets, + ARRAY_SIZE(max_98390_tt_dapm_widgets)); + if (ret) { + dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret); + /* Don't need to add routes if widget addition failed */ + return ret; + } + + ret = snd_soc_add_card_controls(card, max_98390_tt_kcontrols, + ARRAY_SIZE(max_98390_tt_kcontrols)); + if (ret) { + dev_err(rtd->dev, "unable to add card controls, ret %d\n", ret); + return ret; + } + + ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, + ARRAY_SIZE(max_98373_dapm_routes)); + if (ret) { + dev_err(rtd->dev, "Speaker Left, Right map addition failed: %d\n", ret); + return ret; + } + + ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_tt_dapm_routes, + ARRAY_SIZE(max_98390_tt_dapm_routes)); + if (ret) + dev_err(rtd->dev, "Tweeter Speaker Left, Right map addition failed: %d\n", ret); + + return ret; +} +EXPORT_SYMBOL_NS(max_98390_spk_codec_init, SND_SOC_INTEL_SOF_MAXIM_COMMON); + +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, int ch) +{ + if (ch == ARRAY_SIZE(max_98390_4spk_codec_conf)) { + card->codec_conf = max_98390_4spk_codec_conf; + card->num_configs = ARRAY_SIZE(max_98390_4spk_codec_conf); + } else { + 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 index 3ff5e8fec4de..412b9dd06bad 100644 --- a/sound/soc/intel/boards/sof_maxim_common.h +++ b/sound/soc/intel/boards/sof_maxim_common.h @@ -24,6 +24,22 @@ 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" +#define MAX_98390_DEV2_NAME "i2c-MX98390:02" +#define MAX_98390_DEV3_NAME "i2c-MX98390:03" + +extern struct snd_soc_dai_link_component max_98390_components[2]; +extern struct snd_soc_dai_link_component max_98390_4spk_components[4]; +extern struct snd_soc_ops max_98390_ops; +extern const struct snd_soc_dapm_route max_98390_dapm_routes[]; +void max_98390_set_codec_conf(struct snd_soc_card *card, int ch); +int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd); + /* * Maxim MAX98357A/MAX98360A */ diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index f096bd6d69be..9acadfe03ef3 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -49,6 +49,8 @@ #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) +#define SOF_MAX98390_TWEETER_SPEAKER_PRESENT BIT(24) /* BT audio offload: reserve 3 bits for future */ #define SOF_BT_OFFLOAD_SSP_SHIFT 19 @@ -176,6 +178,36 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { SOF_RT5682_SSP_AMP(2) | SOF_RT5682_NUM_HDMIDEV(4)), }, + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S"), + }, + .driver_data = (void *)(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)), + }, + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S_4SPK"), + }, + .driver_data = (void *)(SOF_RT5682_MCLK_EN | + SOF_RT5682_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_MAX98390_SPEAKER_AMP_PRESENT | + SOF_MAX98390_TWEETER_SPEAKER_PRESENT | + SOF_RT5682_SSP_AMP(1) | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + + }, {} }; @@ -459,6 +491,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) if (err < 0) return err; } + return hdac_hdmi_jack_port_init(component, &card->dapm); } @@ -745,6 +778,21 @@ 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) { + if (sof_rt5682_quirk & + SOF_MAX98390_TWEETER_SPEAKER_PRESENT) { + links[id].codecs = max_98390_4spk_components; + links[id].num_codecs = ARRAY_SIZE(max_98390_4spk_components); + links[id].init = max_98390_spk_codec_init; + } else { + 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 +929,14 @@ 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) { + if (sof_rt5682_quirk & SOF_MAX98390_TWEETER_SPEAKER_PRESENT) + max_98390_set_codec_conf(&sof_audio_card_rt5682, + ARRAY_SIZE(max_98390_4spk_components)); + else + max_98390_set_codec_conf(&sof_audio_card_rt5682, + ARRAY_SIZE(max_98390_components)); + } if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) sof_audio_card_rt5682.num_links++; @@ -1007,6 +1063,18 @@ 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(1) | + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, + { } }; MODULE_DEVICE_TABLE(platform, board_ids); @@ -1026,6 +1094,7 @@ MODULE_DESCRIPTION("SOF Audio Machine driver"); MODULE_AUTHOR("Bard Liao <bard.liao@intel.com>"); MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>"); MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>"); +MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>"); MODULE_LICENSE("GPL v2"); MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON); MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON); 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..2db152998e4a 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_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); diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index bc9e70765678..be90a5f79766 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -59,6 +59,15 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-rt5682-ssp0-max98373-ssp2.tplg", }, + { + .callback = sof_tplg_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S"), + }, + .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", + }, + {} };