ASoC: Intel: bxt_da7219_max98357a: remove glk support

Remove glk platform support and use sof_da7219 machine driver instead
for existing glk boards with MAX98357A 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-14-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 134512a7d3b8e99eb443cce50551ba6097d801f9..d48b196817b48c1706d781514df5cb228d7b9446 100644 (file)
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -305,10 +305,6 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
        select SND_SOC_HDAC_HDMI
        select SND_SOC_INTEL_HDA_DSP_COMMON
 
-config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
-       tristate
-       select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
-
 if SND_SOC_INTEL_APL
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
@@ -316,7 +312,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
        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
+       select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
        help
           This adds support for ASoC machine driver for Broxton-P platforms
           with DA7219 + MAX98357A I2S audio codec.
@@ -432,13 +428,11 @@ if SND_SOC_SOF_GEMINILAKE
 
 config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
        tristate "GLK with DA7219 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI
-       depends on MFD_INTEL_LPSS || COMPILE_TEST
-       depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
-       select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+       imply SND_SOC_INTEL_SOF_DA7219_MACH
        help
           This adds support for ASoC machine driver for Geminilake platforms
-          with DA7219 + MAX98357A I2S audio codec.
+          with DA7219 + MAX98357A I2S audio codec. This option is deprecated
+          and please use SND_SOC_INTEL_SOF_DA7219_MACH instead.
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 

diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 119413c262de70c6d87757a7f302444edb80dcc9..e4bd5689eb1c5dd389d2e276ad8d4333b6fbc67f 100644 (file)
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH) += snd-soc-sof_es8336.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH) += snd-soc-sof_nau8825.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH) += snd-soc-sof_da7219.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-hsw-rt5640.o
-obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
+obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH) += snd-soc-sst-sof-wm8804.o

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 45fe1d7b886583810d0f32ee59675ecd8237a0ae..57e75f87bea627cefd8494a15d0654da5e67169b 100644 (file)
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -134,9 +134,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
        /* speaker */
        {"Spk", NULL, "Speaker"},
-};
 
-static const struct snd_soc_dapm_route broxton_map[] = {
        {"HiFi Playback", NULL, "ssp5 Tx"},
        {"ssp5 Tx", NULL, "codec0_out"},
 
@@ -147,17 +145,6 @@ static const struct snd_soc_dapm_route broxton_map[] = {
        {"ssp1 Rx", NULL, "Capture"},
 };
 
-static const struct snd_soc_dapm_route gemini_map[] = {
-       {"HiFi Playback", NULL, "ssp1 Tx"},
-       {"ssp1 Tx", NULL, "codec0_out"},
-
-       {"Playback", NULL, "ssp2 Tx"},
-       {"ssp2 Tx", NULL, "codec1_out"},
-
-       {"codec0_in", NULL, "ssp2 Rx"},
-       {"ssp2 Rx", NULL, "Capture"},
-};
-
 static struct snd_soc_jack_pin jack_pins[] = {
        {
                .pin    = "Headphone Jack",
@@ -626,13 +613,6 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
        int err, i = 0;
        char jack_name[NAME_SIZE];
 
-       if (soc_intel_is_glk())
-               snd_soc_dapm_add_routes(&card->dapm, gemini_map,
-                                       ARRAY_SIZE(gemini_map));
-       else
-               snd_soc_dapm_add_routes(&card->dapm, broxton_map,
-                                       ARRAY_SIZE(broxton_map));
-
        if (list_empty(&ctx->hdmi_pcm_list))
                return -EINVAL;
 
@@ -696,29 +676,6 @@ static int broxton_audio_probe(struct platform_device *pdev)
 
        broxton_audio_card.dev = &pdev->dev;
        snd_soc_card_set_drvdata(&broxton_audio_card, ctx);
-       if (soc_intel_is_glk()) {
-               unsigned int i;
-
-               broxton_audio_card.name = "glkda7219max";
-               /* Fixup the SSP entries for geminilake */
-               for (i = 0; i < ARRAY_SIZE(broxton_dais); i++) {
-                       if (!broxton_dais[i].codecs->dai_name)
-                               continue;
-
-                       /* MAXIM_CODEC is connected to SSP1. */
-                       if (!strcmp(broxton_dais[i].codecs->dai_name,
-                                   BXT_MAXIM_CODEC_DAI)) {
-                               broxton_dais[i].name = "SSP1-Codec";
-                               broxton_dais[i].cpus->dai_name = "SSP1 Pin";
-                       }
-                       /* DIALOG_CODE is connected to SSP2 */
-                       else if (!strcmp(broxton_dais[i].codecs->dai_name,
-                                        BXT_DIALOG_CODEC_DAI)) {
-                               broxton_dais[i].name = "SSP2-Codec";
-                               broxton_dais[i].cpus->dai_name = "SSP2 Pin";
-                       }
-               }
-       }
 
        /* override platform name, if required */
        mach = pdev->dev.platform_data;
@@ -736,7 +693,6 @@ static int broxton_audio_probe(struct platform_device *pdev)
 
 static const struct platform_device_id bxt_board_ids[] = {
        { .name = "bxt_da7219_mx98357a" },
-       { .name = "glk_da7219_mx98357a" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, bxt_board_ids);

diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index 8911c90bbaf68f50cff737f68b3c5772b90ec69e..1d30991afdc846eb52fce0eaf93650567c846195 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -33,7 +33,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
        },
        {
                .id = "DLGS7219",
-               .drv_name = "glk_da7219_mx98357a",
+               .drv_name = "glk_da7219_def",
                .fw_filename = "intel/dsp_fw_glk.bin",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &glk_codecs,