Linux Sound subsystem development
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: linux-sound@vger.kernel.org
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org,
	Brent Lu <brent.lu@intel.com>,
	Bard Liao <yung-chuan.liao@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 11/18] ASoC: Intel: sof_sdw: add max98373 dapm routes
Date: Thu,  9 May 2024 11:34:11 -0500	[thread overview]
Message-ID: <20240509163418.67746-12-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20240509163418.67746-1-pierre-louis.bossart@linux.intel.com>

From: Brent Lu <brent.lu@intel.com>

Add dapm routes of max98373 to sdw driver and remove dependency of
maxim-common module.

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>
---
 sound/soc/intel/boards/Kconfig         | 1 -
 sound/soc/intel/boards/sof_sdw.c       | 1 -
 sound/soc/intel/boards/sof_sdw_maxim.c | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 17bd0f883b9e..3ed81ab649c5 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -681,7 +681,6 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
 	select SND_SOC_CS35L56_SDW
 	select SND_SOC_DMIC
 	select SND_SOC_INTEL_HDA_DSP_COMMON
-	select SND_SOC_INTEL_SOF_MAXIM_COMMON
 	imply SND_SOC_SDW_MOCKUP
 	help
 	  Add support for Intel SoundWire-based platforms connected to
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index b1595fdb500d..2b97972f85ef 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -2067,4 +2067,3 @@ MODULE_AUTHOR("Rander Wang <rander.wang@linux.intel.com>");
 MODULE_AUTHOR("Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);
-MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);
diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c
index 432e5112415a..57c1a5fb17a9 100644
--- a/sound/soc/intel/boards/sof_sdw_maxim.c
+++ b/sound/soc/intel/boards/sof_sdw_maxim.c
@@ -11,7 +11,6 @@
 #include <sound/soc-acpi.h>
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
-#include "sof_maxim_common.h"
 
 static int maxim_part_id;
 #define SOF_SDW_PART_ID_MAX98363 0x8363
@@ -27,6 +26,11 @@ static const struct snd_kcontrol_new maxim_controls[] = {
 	SOC_DAPM_PIN_SWITCH("Right Spk"),
 };
 
+static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {
+	{ "Left Spk", NULL, "Left BE_OUT" },
+	{ "Right Spk", NULL, "Right BE_OUT" },
+};
+
 int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
-- 
2.40.1


  parent reply	other threads:[~2024-05-09 16:34 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-09 16:34 [PATCH 00/18] ASoC: Intel: updates for 6.10 - part7 Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 01/18] ASoC: Intel: sof_sdw_rt_sdca_jack_common: remove -sdca for new codecs Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 02/18] ASoC: Intel: sof-rt5682: remove DMI quirk for hatch Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 03/18] ASoC: Intel: sof_rt5682: board id cleanup for mtl boards Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 04/18] ASoC: Intel: realtek-common: remove 2-spk rt1015p config Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 05/18] ASoC: Intel: soc-acpi-intel-mtl-match: add cs42l43 only support Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 06/18] ASoC: Intel: soc-acpi-intel-lnl-match: " Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 07/18] ASoC: Intel: maxim-common: add max_98373_dai_link function Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 08/18] ASoC: Intel: sof_da7219: use " Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 09/18] ASoC: Intel: sof_nau8825: " Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 10/18] ASoC: Intel: sof_rt5682: " Pierre-Louis Bossart
2024-05-09 16:34 ` Pierre-Louis Bossart [this message]
2024-05-09 16:34 ` [PATCH 12/18] ASoC: Intel: maxim-common: change max98373 data to static Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 13/18] ASoC: Intel: sof_sdw_cs_amp: rename Speakers to Speaker Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 14/18] ASoC: Intel: sof_sdw: use generic name for controls/widgets Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 15/18] ASoC: Intel: sof_sdw: add controls and dapm widgets in codec_info Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 16/18] ASoC: Intel: sof_sdw: use .controls/.widgets to add controls/widgets Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 17/18] ASoC: Intel: sof_sdw: add dai parameter to rtd_init callback Pierre-Louis Bossart
2024-05-09 16:34 ` [PATCH 18/18] ASoC: Intel: sof_sdw_rt_amp: use dai parameter Pierre-Louis Bossart
2024-05-10 13:18 ` [PATCH 00/18] ASoC: Intel: updates for 6.10 - part7 Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240509163418.67746-12-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=brent.lu@intel.com \
    --cc=broonie@kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=tiwai@suse.de \
    --cc=yung-chuan.liao@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox