ASoC: Intel: sof_sdw: Rename sof_sdw_max98373.c file to sof_sdw_maxim.c

This is needed to use the common implementation for other maxim
soundwire codecs

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Yong Zhi <yong.zhi@intel.com>
Signed-off-by: Uday M Bhat <uday.m.bhat@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230602202225.249209-25-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 2de930b..931415d 100644 (file)
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -37,7 +37,7 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o
 snd-soc-ehl-rt5660-objs := ehl_rt5660.o
 snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o
 snd-soc-sof-sdw-objs += sof_sdw.o                              \
-                       sof_sdw_max98373.o sof_sdw_rt_amp.o     \
+                       sof_sdw_maxim.o sof_sdw_rt_amp.o        \
                        sof_sdw_rt5682.o sof_sdw_rt700.o        \
                        sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o   \
                        sof_sdw_rt712_sdca.o sof_sdw_rt715.o    \

diff --git a/sound/soc/intel/boards/sof_sdw_max98373.c b/sound/soc/intel/boards/sof_sdw_max98373.c
deleted file mode 100644 (file)
index 3d7df58..0000000
--- a/sound/soc/intel/boards/sof_sdw_max98373.c
+++ /dev/null
@@ -1,148 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (c) 2020 Intel Corporation
-//
-// sof_sdw_max98373 - Helpers to handle 2x MAX98373
-// codec devices from generic machine driver
-
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <sound/control.h>
-#include <sound/soc.h>
-#include <sound/soc-acpi.h>
-#include <sound/soc-dapm.h>
-#include "sof_sdw_common.h"
-#include "sof_maxim_common.h"
-
-static const struct snd_soc_dapm_widget mx8373_widgets[] = {
-       SND_SOC_DAPM_SPK("Left Spk", NULL),
-       SND_SOC_DAPM_SPK("Right Spk", NULL),
-};
-
-static const struct snd_kcontrol_new mx8373_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Left Spk"),
-       SOC_DAPM_PIN_SWITCH("Right Spk"),
-};
-
-static int spk_init(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_card *card = rtd->card;
-       int ret;
-
-       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-                                         "%s spk:mx8373",
-                                         card->components);
-       if (!card->components)
-               return -ENOMEM;
-
-       ret = snd_soc_add_card_controls(card, mx8373_controls,
-                                       ARRAY_SIZE(mx8373_controls));
-       if (ret) {
-               dev_err(card->dev, "mx8373 ctrls addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, mx8373_widgets,
-                                       ARRAY_SIZE(mx8373_widgets));
-       if (ret) {
-               dev_err(card->dev, "mx8373 widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, 2);
-       if (ret)
-               dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);
-
-       return ret;
-}
-
-static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enable)
-{
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_dai *codec_dai;
-       struct snd_soc_dai *cpu_dai;
-       int ret;
-       int j;
-
-       /* set spk pin by playback only */
-       if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-               return 0;
-
-       cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-       for_each_rtd_codec_dais(rtd, j, codec_dai) {
-               struct snd_soc_dapm_context *dapm =
-                               snd_soc_component_get_dapm(cpu_dai->component);
-               char pin_name[16];
-
-               snprintf(pin_name, ARRAY_SIZE(pin_name), "%s Spk",
-                        codec_dai->component->name_prefix);
-
-               if (enable)
-                       ret = snd_soc_dapm_enable_pin(dapm, pin_name);
-               else
-                       ret = snd_soc_dapm_disable_pin(dapm, pin_name);
-
-               if (!ret)
-                       snd_soc_dapm_sync(dapm);
-       }
-
-       return 0;
-}
-
-static int mx8373_sdw_prepare(struct snd_pcm_substream *substream)
-{
-       int ret;
-
-       /* according to soc_pcm_prepare dai link prepare is called first */
-       ret = sdw_prepare(substream);
-       if (ret < 0)
-               return ret;
-
-       return mx8373_enable_spk_pin(substream, true);
-}
-
-static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream)
-{
-       int ret;
-
-       /* according to soc_pcm_hw_free dai link free is called first */
-       ret = sdw_hw_free(substream);
-       if (ret < 0)
-               return ret;
-
-       return mx8373_enable_spk_pin(substream, false);
-}
-
-static const struct snd_soc_ops max_98373_sdw_ops = {
-       .startup = sdw_startup,
-       .prepare = mx8373_sdw_prepare,
-       .trigger = sdw_trigger,
-       .hw_free = mx8373_sdw_hw_free,
-       .shutdown = sdw_shutdown,
-};
-
-static int mx8373_sdw_late_probe(struct snd_soc_card *card)
-{
-       struct snd_soc_dapm_context *dapm = &card->dapm;
-
-       /* Disable Left and Right Spk pin after boot */
-       snd_soc_dapm_disable_pin(dapm, "Left Spk");
-       snd_soc_dapm_disable_pin(dapm, "Right Spk");
-       return snd_soc_dapm_sync(dapm);
-}
-
-int sof_sdw_mx8373_init(struct snd_soc_card *card,
-                       const struct snd_soc_acpi_link_adr *link,
-                       struct snd_soc_dai_link *dai_links,
-                       struct sof_sdw_codec_info *info,
-                       bool playback)
-{
-       info->amp_num++;
-       if (info->amp_num == 2)
-               dai_links->init = spk_init;
-
-       info->codec_card_late_probe = mx8373_sdw_late_probe;
-
-       dai_links->ops = &max_98373_sdw_ops;
-
-       return 0;
-}

diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c
new file mode 100644 (file)
index 0000000..3d7df58
--- /dev/null
+++ b/sound/soc/intel/boards/sof_sdw_maxim.c
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Copyright (c) 2020 Intel Corporation
+//
+// sof_sdw_max98373 - Helpers to handle 2x MAX98373
+// codec devices from generic machine driver
+
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <sound/control.h>
+#include <sound/soc.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc-dapm.h>
+#include "sof_sdw_common.h"
+#include "sof_maxim_common.h"
+
+static const struct snd_soc_dapm_widget mx8373_widgets[] = {
+       SND_SOC_DAPM_SPK("Left Spk", NULL),
+       SND_SOC_DAPM_SPK("Right Spk", NULL),
+};
+
+static const struct snd_kcontrol_new mx8373_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Left Spk"),
+       SOC_DAPM_PIN_SWITCH("Right Spk"),
+};
+
+static int spk_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       int ret;
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s spk:mx8373",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       ret = snd_soc_add_card_controls(card, mx8373_controls,
+                                       ARRAY_SIZE(mx8373_controls));
+       if (ret) {
+               dev_err(card->dev, "mx8373 ctrls addition failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dapm_new_controls(&card->dapm, mx8373_widgets,
+                                       ARRAY_SIZE(mx8373_widgets));
+       if (ret) {
+               dev_err(card->dev, "mx8373 widgets addition failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, 2);
+       if (ret)
+               dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);
+
+       return ret;
+}
+
+static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enable)
+{
+       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_dai *codec_dai;
+       struct snd_soc_dai *cpu_dai;
+       int ret;
+       int j;
+
+       /* set spk pin by playback only */
+       if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+               return 0;
+
+       cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+       for_each_rtd_codec_dais(rtd, j, codec_dai) {
+               struct snd_soc_dapm_context *dapm =
+                               snd_soc_component_get_dapm(cpu_dai->component);
+               char pin_name[16];
+
+               snprintf(pin_name, ARRAY_SIZE(pin_name), "%s Spk",
+                        codec_dai->component->name_prefix);
+
+               if (enable)
+                       ret = snd_soc_dapm_enable_pin(dapm, pin_name);
+               else
+                       ret = snd_soc_dapm_disable_pin(dapm, pin_name);
+
+               if (!ret)
+                       snd_soc_dapm_sync(dapm);
+       }
+
+       return 0;
+}
+
+static int mx8373_sdw_prepare(struct snd_pcm_substream *substream)
+{
+       int ret;
+
+       /* according to soc_pcm_prepare dai link prepare is called first */
+       ret = sdw_prepare(substream);
+       if (ret < 0)
+               return ret;
+
+       return mx8373_enable_spk_pin(substream, true);
+}
+
+static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream)
+{
+       int ret;
+
+       /* according to soc_pcm_hw_free dai link free is called first */
+       ret = sdw_hw_free(substream);
+       if (ret < 0)
+               return ret;
+
+       return mx8373_enable_spk_pin(substream, false);
+}
+
+static const struct snd_soc_ops max_98373_sdw_ops = {
+       .startup = sdw_startup,
+       .prepare = mx8373_sdw_prepare,
+       .trigger = sdw_trigger,
+       .hw_free = mx8373_sdw_hw_free,
+       .shutdown = sdw_shutdown,
+};
+
+static int mx8373_sdw_late_probe(struct snd_soc_card *card)
+{
+       struct snd_soc_dapm_context *dapm = &card->dapm;
+
+       /* Disable Left and Right Spk pin after boot */
+       snd_soc_dapm_disable_pin(dapm, "Left Spk");
+       snd_soc_dapm_disable_pin(dapm, "Right Spk");
+       return snd_soc_dapm_sync(dapm);
+}
+
+int sof_sdw_mx8373_init(struct snd_soc_card *card,
+                       const struct snd_soc_acpi_link_adr *link,
+                       struct snd_soc_dai_link *dai_links,
+                       struct sof_sdw_codec_info *info,
+                       bool playback)
+{
+       info->amp_num++;
+       if (info->amp_num == 2)
+               dai_links->init = spk_init;
+
+       info->codec_card_late_probe = mx8373_sdw_late_probe;
+
+       dai_links->ops = &max_98373_sdw_ops;
+
+       return 0;
+}