Unverified Commit 15ce635f authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: add max98373 dapm routes 



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

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240509163418.67746-12-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 834c4f95

sound/soc/intel/boards/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/intel/boards/sof_sdw.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/intel/boards/sof_sdw_maxim.c

+5 −1
Original line number Diff line number Diff line
@@ -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;