ASoC: Intel: bxt_da7219_max98357a: remove cml support

Remove cml platform support and use sof_da7219 machine driver instead
for existing cml 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-11-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 a61c3d0435c4c5068ed0fc07414508ff0c098ca6..134512a7d3b8e99eb443cce50551ba6097d801f9 100644 (file)
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -584,13 +584,11 @@ if (SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK)
 
 config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
        tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
-       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.
+          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/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 9f167c828d1ceb77e8dd2150c9440a1014af90d0..45fe1d7b886583810d0f32ee59675ecd8237a0ae 100644 (file)
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -201,10 +201,7 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)
        int clk_freq;
 
        /* Configure sysclk for codec */
-       if (soc_intel_is_cml())
-               clk_freq = 24000000;
-       else
-               clk_freq = 19200000;
+       clk_freq = 19200000;
 
        ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, clk_freq,
                                     SND_SOC_CLOCK_IN);
@@ -721,28 +718,6 @@ static int broxton_audio_probe(struct platform_device *pdev)
                                broxton_dais[i].cpus->dai_name = "SSP2 Pin";
                        }
                }
-       } else if (soc_intel_is_cml()) {
-               unsigned int i;
-
-               broxton_audio_card.name = "cmlda7219max";
-
-               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_CODEC is connected to SSP0 */
-                       else if (!strcmp(broxton_dais[i].codecs->dai_name,
-                                       BXT_DIALOG_CODEC_DAI)) {
-                               broxton_dais[i].name = "SSP0-Codec";
-                               broxton_dais[i].cpus->dai_name = "SSP0 Pin";
-                       }
-               }
        }
 
        /* override platform name, if required */
@@ -762,7 +737,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" },
-       { .name = "cml_da7219_mx98357a" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, bxt_board_ids);

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 4217dbb716dcf5743397630daf1a280892f74f74..f79d7558174a1075a22e1ae7ea958163a44e2d21 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -68,7 +68,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 = &max98357a_spk_codecs,
                .sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",