ASoC: Intel: bxt_da7219_max98357a: remove MAX98390 support

Remove MAX98390 support and use sof_da7219 machine driver instead for
existing cml boards with MAX98390 speaker amplifier.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240426152529.38345-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index e300af4d6b9f8333433567d3ac605171e5684095..44cf1a8df51043de45a2e544bc02377d97bd07cb 100644 (file)
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -301,7 +301,6 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
        tristate
        select SND_SOC_DA7219
        select SND_SOC_MAX98357A
-       select SND_SOC_MAX98390
        select SND_SOC_DMIC
        select SND_SOC_HDAC_HDMI
        select SND_SOC_INTEL_HDA_DSP_COMMON
@@ -313,14 +312,14 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
 if SND_SOC_INTEL_APL
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
-       tristate "Broxton with DA7219 and MAX98357A/MAX98390 in I2S Mode"
+       tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
        depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI
        select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
        help
           This adds support for ASoC machine driver for Broxton-P platforms
-          with DA7219 + MAX98357A/MAX98390 I2S audio codec.
+          with DA7219 + MAX98357A I2S audio codec.
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
@@ -587,6 +586,7 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
        depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+       imply SND_SOC_INTEL_SOF_DA7219_MACH
        help
           This adds support for ASoC machine driver for Cometlake platforms
           with DA7219 + MAX98357A I2S audio codec.

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 3fe3f38c6cb698c364028234dc551c885be13ed5..9f167c828d1ceb77e8dd2150c9440a1014af90d0 100644 (file)
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -24,14 +24,9 @@
 
 #define BXT_DIALOG_CODEC_DAI   "da7219-hifi"
 #define BXT_MAXIM_CODEC_DAI    "HiFi"
-#define MAX98390_DEV0_NAME     "i2c-MX98390:00"
-#define MAX98390_DEV1_NAME     "i2c-MX98390:01"
 #define DUAL_CHANNEL           2
 #define QUAD_CHANNEL           4
 
-#define SPKAMP_MAX98357A       1
-#define SPKAMP_MAX98390        2
-
 static struct snd_soc_jack broxton_headset;
 static struct snd_soc_jack broxton_hdmi[3];
 
@@ -44,7 +39,6 @@ struct bxt_hdmi_pcm {
 struct bxt_card_private {
        struct list_head hdmi_pcm_list;
        bool common_hdmi_codec_drv;
-       int spkamp;
 };
 
 enum {
@@ -91,17 +85,9 @@ static const struct snd_kcontrol_new broxton_controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone Jack"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
        SOC_DAPM_PIN_SWITCH("Line Out"),
-};
-
-static const struct snd_kcontrol_new max98357a_controls[] = {
        SOC_DAPM_PIN_SWITCH("Spk"),
 };
 
-static const struct snd_kcontrol_new max98390_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Left Spk"),
-       SOC_DAPM_PIN_SWITCH("Right Spk"),
-};
-
 static const struct snd_soc_dapm_widget broxton_widgets[] = {
        SND_SOC_DAPM_HP("Headphone Jack", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -112,17 +98,9 @@ static const struct snd_soc_dapm_widget broxton_widgets[] = {
        SND_SOC_DAPM_SPK("HDMI3", NULL),
        SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
                        platform_clock_control, SND_SOC_DAPM_POST_PMD|SND_SOC_DAPM_PRE_PMU),
-};
-
-static const struct snd_soc_dapm_widget max98357a_widgets[] = {
        SND_SOC_DAPM_SPK("Spk", NULL),
 };
 
-static const struct snd_soc_dapm_widget max98390_widgets[] = {
-       SND_SOC_DAPM_SPK("Left Spk", NULL),
-       SND_SOC_DAPM_SPK("Right Spk", NULL),
-};
-
 static const struct snd_soc_dapm_route audio_map[] = {
        /* HP jack connectors - unknown if we have jack detection */
        {"Headphone Jack", NULL, "HPL"},
@@ -153,19 +131,11 @@ static const struct snd_soc_dapm_route audio_map[] = {
        { "Headphone Jack", NULL, "Platform Clock" },
        { "Headset Mic", NULL, "Platform Clock" },
        { "Line Out", NULL, "Platform Clock" },
-};
 
-static const struct snd_soc_dapm_route max98357a_routes[] = {
        /* speaker */
        {"Spk", NULL, "Speaker"},
 };
 
-static const struct snd_soc_dapm_route max98390_routes[] = {
-       /* Speaker */
-       {"Left Spk", NULL, "Left BE_OUT"},
-       {"Right Spk", NULL, "Right BE_OUT"},
-};
-
 static const struct snd_soc_dapm_route broxton_map[] = {
        {"HiFi Playback", NULL, "ssp5 Tx"},
        {"ssp5 Tx", NULL, "codec0_out"},
@@ -453,10 +423,6 @@ SND_SOC_DAILINK_DEF(ssp5_pin,
 SND_SOC_DAILINK_DEF(ssp5_codec,
        DAILINK_COMP_ARRAY(COMP_CODEC("MX98357A:00",
                                      BXT_MAXIM_CODEC_DAI)));
-SND_SOC_DAILINK_DEF(max98390_codec,
-       DAILINK_COMP_ARRAY(
-       /* Left */      COMP_CODEC(MAX98390_DEV0_NAME, "max98390-aif1"),
-       /* Right */     COMP_CODEC(MAX98390_DEV1_NAME, "max98390-aif1")));
 
 SND_SOC_DAILINK_DEF(ssp1_pin,
        DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin")));
@@ -654,69 +620,15 @@ static struct snd_soc_dai_link broxton_dais[] = {
        },
 };
 
-static struct snd_soc_codec_conf max98390_codec_confs[] = {
-       {
-               .dlc = COMP_CODEC_CONF(MAX98390_DEV0_NAME),
-               .name_prefix = "Left",
-       },
-       {
-               .dlc = COMP_CODEC_CONF(MAX98390_DEV1_NAME),
-               .name_prefix = "Right",
-       },
-};
-
 #define NAME_SIZE      32
 static int bxt_card_late_probe(struct snd_soc_card *card)
 {
        struct bxt_card_private *ctx = snd_soc_card_get_drvdata(card);
        struct bxt_hdmi_pcm *pcm;
        struct snd_soc_component *component = NULL;
-       const struct snd_kcontrol_new *controls;
-       const struct snd_soc_dapm_widget *widgets;
-       const struct snd_soc_dapm_route *routes;
-       int num_controls, num_widgets, num_routes, err, i = 0;
+       int err, i = 0;
        char jack_name[NAME_SIZE];
 
-       switch (ctx->spkamp) {
-       case SPKAMP_MAX98357A:
-               controls = max98357a_controls;
-               num_controls = ARRAY_SIZE(max98357a_controls);
-               widgets = max98357a_widgets;
-               num_widgets = ARRAY_SIZE(max98357a_widgets);
-               routes = max98357a_routes;
-               num_routes = ARRAY_SIZE(max98357a_routes);
-               break;
-       case SPKAMP_MAX98390:
-               controls = max98390_controls;
-               num_controls = ARRAY_SIZE(max98390_controls);
-               widgets = max98390_widgets;
-               num_widgets = ARRAY_SIZE(max98390_widgets);
-               routes = max98390_routes;
-               num_routes = ARRAY_SIZE(max98390_routes);
-               break;
-       default:
-               dev_err(card->dev, "Invalid speaker amplifier %d\n", ctx->spkamp);
-               return -EINVAL;
-       }
-
-       err = snd_soc_dapm_new_controls(&card->dapm, widgets, num_widgets);
-       if (err) {
-               dev_err(card->dev, "Fail to new widgets\n");
-               return err;
-       }
-
-       err = snd_soc_add_card_controls(card, controls, num_controls);
-       if (err) {
-               dev_err(card->dev, "Fail to add controls\n");
-               return err;
-       }
-
-       err = snd_soc_dapm_add_routes(&card->dapm, routes, num_routes);
-       if (err) {
-               dev_err(card->dev, "Fail to add routes\n");
-               return err;
-       }
-
        if (soc_intel_is_glk())
                snd_soc_dapm_add_routes(&card->dapm, gemini_map,
                                        ARRAY_SIZE(gemini_map));
@@ -785,11 +697,6 @@ static int broxton_audio_probe(struct platform_device *pdev)
 
        INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
 
-       if (acpi_dev_present("MX98390", NULL, -1))
-               ctx->spkamp = SPKAMP_MAX98390;
-       else
-               ctx->spkamp = SPKAMP_MAX98357A;
-
        broxton_audio_card.dev = &pdev->dev;
        snd_soc_card_set_drvdata(&broxton_audio_card, ctx);
        if (soc_intel_is_glk()) {
@@ -817,13 +724,7 @@ static int broxton_audio_probe(struct platform_device *pdev)
        } else if (soc_intel_is_cml()) {
                unsigned int i;
 
-               if (ctx->spkamp == SPKAMP_MAX98390) {
-                       broxton_audio_card.name = "cml_max98390_da7219";
-
-                       broxton_audio_card.codec_conf = max98390_codec_confs;
-                       broxton_audio_card.num_configs = ARRAY_SIZE(max98390_codec_confs);
-               } else
-                       broxton_audio_card.name = "cmlda7219max";
+               broxton_audio_card.name = "cmlda7219max";
 
                for (i = 0; i < ARRAY_SIZE(broxton_dais); i++) {
                        if (!broxton_dais[i].codecs->dai_name)
@@ -834,12 +735,6 @@ static int broxton_audio_probe(struct platform_device *pdev)
                                        BXT_MAXIM_CODEC_DAI)) {
                                broxton_dais[i].name = "SSP1-Codec";
                                broxton_dais[i].cpus->dai_name = "SSP1 Pin";
-
-                               if (ctx->spkamp == SPKAMP_MAX98390) {
-                                       broxton_dais[i].codecs = max98390_codec;
-                                       broxton_dais[i].num_codecs = ARRAY_SIZE(max98390_codec);
-                                       broxton_dais[i].dpcm_capture = 1;
-                               }
                        }
                        /* DIALOG_CODEC is connected to SSP0 */
                        else if (!strcmp(broxton_dais[i].codecs->dai_name,

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 160bfa0e5ef5f567d286915a33b4b579c915d56c..4217dbb716dcf5743397630daf1a280892f74f74 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -75,7 +75,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
        },
        {
                .id = "DLGS7219",
-               .drv_name = "cml_da7219_mx98357a",
+               .drv_name = "cml_da7219_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &max98390_spk_codecs,
                .sof_tplg_filename = "sof-cml-da7219-max98390.tplg",