ASoC: amd: vangogh: Add support for NAU8821/MAX98388 variant

Extend the Vangogh machine driver to support a variant based on the
Nuvoton NAU88L21 Codec and the Analog Devices MAX98388 Speaker
Amplifier.

Additionally, enable probing via ACPI match table for this and future
hardware revisions.

Co-developed-by: Lucas Tanure <lucas.tanure@collabora.com>
Signed-off-by: Lucas Tanure <lucas.tanure@collabora.com>
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20230705214800.193244-4-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index 1dd8579e803474502e35d92fab5a6a9b5a505727..273688c053172f267ca63e82eea4c1d778e41c04 100644 (file)
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -79,14 +79,15 @@ config SND_SOC_AMD_ACP5x
         ACP DMA driver, CPU DAI driver.
 
 config SND_SOC_AMD_VANGOGH_MACH
-       tristate "AMD Vangogh support for NAU8821 CS35L41"
+       tristate "AMD Vangogh support for NAU8821/CS35L41/MAX98388"
        select SND_SOC_NAU8821
        select SND_SOC_CS35L41_SPI
+       select SND_SOC_MAX98388
        select SND_AMD_ACP_CONFIG
        depends on SND_SOC_AMD_ACP5x && I2C && SPI_MASTER
        help
          This option enables machine driver for Vangogh platform
-         using NAU8821 and CS35L41 codecs.
+         using NAU8821 and either CS35L41 or MAX98388 codecs.
          Say m if you have such a device.
          If unsure select "N".
 

diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c
index 1efa8f8b77abe3ea7e911aa0a3c01d304630d24d..125a8e93478d6b4e82c9f28c5be0f11dfc80d1f5 100644 (file)
--- a/sound/soc/amd/vangogh/acp5x-mach.c
+++ b/sound/soc/amd/vangogh/acp5x-mach.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Machine driver for AMD Vangogh platform using NAU8821 & CS35L41
- * codecs.
+ * Machine driver for AMD Vangogh platform using either
+ * NAU8821 & CS35L41 or NAU8821 & MAX98388 codecs.
  *
  * Copyright 2021 Advanced Micro Devices, Inc.
  */
@@ -29,6 +29,9 @@
 #define ACP5X_CS35L41_COMP_LNAME       "spi-VLV1776:00"
 #define ACP5X_CS35L41_COMP_RNAME       "spi-VLV1776:01"
 #define ACP5X_CS35L41_DAI_NAME         "cs35l41-pcm"
+#define ACP5X_MAX98388_COMP_LNAME      "i2c-ADS8388:00"
+#define ACP5X_MAX98388_COMP_RNAME      "i2c-ADS8388:01"
+#define ACP5X_MAX98388_DAI_NAME                "max98388-aif1"
 
 static struct snd_soc_jack vg_headset;
 
@@ -326,6 +329,108 @@ static struct snd_soc_card acp5x_8821_35l41_card = {
        .num_controls = ARRAY_SIZE(acp5x_8821_controls),
 };
 
+static int acp5x_max98388_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card);
+       struct snd_pcm_runtime *runtime = substream->runtime;
+
+       machine->play_i2s_instance = I2S_HS_INSTANCE;
+
+       runtime->hw.channels_max = DUAL_CHANNEL;
+       snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  &constraints_channels);
+       snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                  &constraints_rates);
+       return 0;
+}
+
+static const struct snd_soc_ops acp5x_max98388_play_ops = {
+       .startup = acp5x_max98388_startup,
+};
+
+static struct snd_soc_codec_conf acp5x_max98388_conf[] = {
+       {
+               .dlc = COMP_CODEC_CONF(ACP5X_MAX98388_COMP_LNAME),
+               .name_prefix = "Left",
+       },
+       {
+               .dlc = COMP_CODEC_CONF(ACP5X_MAX98388_COMP_RNAME),
+               .name_prefix = "Right",
+       },
+};
+
+SND_SOC_DAILINK_DEF(max98388, DAILINK_COMP_ARRAY(COMP_CODEC(ACP5X_MAX98388_COMP_LNAME,
+                                                           ACP5X_MAX98388_DAI_NAME),
+                                                COMP_CODEC(ACP5X_MAX98388_COMP_RNAME,
+                                                           ACP5X_MAX98388_DAI_NAME)));
+
+static struct snd_soc_dai_link acp5x_8821_98388_dai[] = {
+       {
+               .name = "acp5x-8821-play",
+               .stream_name = "Playback/Capture",
+               .dai_fmt = SND_SOC_DAIFMT_I2S |
+                          SND_SOC_DAIFMT_NB_NF |
+                          SND_SOC_DAIFMT_CBC_CFC,
+               .dpcm_playback = 1,
+               .dpcm_capture = 1,
+               .ops = &acp5x_8821_ops,
+               .init = acp5x_8821_init,
+               SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform),
+       },
+       {
+               .name = "acp5x-max98388-play",
+               .stream_name = "MAX98388 Playback",
+               .dai_fmt = SND_SOC_DAIFMT_I2S |
+                          SND_SOC_DAIFMT_NB_NF |
+                          SND_SOC_DAIFMT_CBC_CFC,
+               .dpcm_playback = 1,
+               .playback_only = 1,
+               .ops = &acp5x_max98388_play_ops,
+               SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform),
+       },
+};
+
+static const struct snd_soc_dapm_widget acp5x_8821_98388_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+       SND_SOC_DAPM_MIC("Int Mic", NULL),
+       SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
+                           platform_clock_control,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+       SND_SOC_DAPM_SPK("SPK", NULL),
+};
+
+static const struct snd_soc_dapm_route acp5x_8821_98388_route[] = {
+       { "Headphone", NULL, "HPOL" },
+       { "Headphone", NULL, "HPOR" },
+       { "MICL", NULL, "Headset Mic" },
+       { "MICR", NULL, "Headset Mic" },
+       { "DMIC", NULL, "Int Mic" },
+
+       { "Headphone", NULL, "Platform Clock" },
+       { "Headset Mic", NULL, "Platform Clock" },
+       { "Int Mic", NULL, "Platform Clock" },
+
+       { "SPK", NULL, "Left BE_OUT" },
+       { "SPK", NULL, "Right BE_OUT" },
+};
+
+static struct snd_soc_card acp5x_8821_98388_card = {
+       .name = "acp5x-max98388",
+       .owner = THIS_MODULE,
+       .dai_link = acp5x_8821_98388_dai,
+       .num_links = ARRAY_SIZE(acp5x_8821_98388_dai),
+       .dapm_widgets = acp5x_8821_98388_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(acp5x_8821_98388_widgets),
+       .dapm_routes = acp5x_8821_98388_route,
+       .num_dapm_routes = ARRAY_SIZE(acp5x_8821_98388_route),
+       .codec_conf = acp5x_max98388_conf,
+       .num_configs = ARRAY_SIZE(acp5x_max98388_conf),
+       .controls = acp5x_8821_controls,
+       .num_controls = ARRAY_SIZE(acp5x_8821_controls),
+};
+
 static const struct dmi_system_id acp5x_vg_quirk_table[] = {
        {
                .matches = {
@@ -344,11 +449,20 @@ static int acp5x_probe(struct platform_device *pdev)
        struct snd_soc_card *card;
        int ret;
 
-       dmi_id = dmi_first_match(acp5x_vg_quirk_table);
-       if (!dmi_id)
-               return -ENODEV;
-
-       card = &acp5x_8821_35l41_card;
+       card = (struct snd_soc_card *)device_get_match_data(dev);
+       if (!card) {
+               /*
+                * This is normally the result of directly probing the driver
+                * in pci-acp5x through platform_device_register_full(), which
+                * is necessary for the CS35L41 variant, as it doesn't support
+                * ACPI probing and relies on DMI quirks.
+                */
+               dmi_id = dmi_first_match(acp5x_vg_quirk_table);
+               if (!dmi_id)
+                       return -ENODEV;
+
+               card = &acp5x_8821_35l41_card;
+       }
 
        machine = devm_kzalloc(dev, sizeof(*machine), GFP_KERNEL);
        if (!machine)
@@ -365,10 +479,17 @@ static int acp5x_probe(struct platform_device *pdev)
        return 0;
 }
 
+static const struct acpi_device_id acp5x_acpi_match[] = {
+       { "AMDI8821", (kernel_ulong_t)&acp5x_8821_98388_card },
+       {},
+};
+MODULE_DEVICE_TABLE(acpi, acp5x_acpi_match);
+
 static struct platform_driver acp5x_mach_driver = {
        .driver = {
                .name = DRV_NAME,
                .pm = &snd_soc_pm_ops,
+               .acpi_match_table = acp5x_acpi_match,
        },
        .probe = acp5x_probe,
 };
@@ -376,6 +497,6 @@ static struct platform_driver acp5x_mach_driver = {
 module_platform_driver(acp5x_mach_driver);
 
 MODULE_AUTHOR("Vijendar.Mukunda@amd.com");
-MODULE_DESCRIPTION("NAU8821 & CS35L41 audio support");
+MODULE_DESCRIPTION("NAU8821/CS35L41 & NAU8821/MAX98388 audio support");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRV_NAME);