Skip to content

Commit 15ce635

Browse files
brentlubroonie
authored andcommitted
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: Bard Liao <[email protected]> Signed-off-by: Brent Lu <[email protected]> Signed-off-by: Pierre-Louis Bossart <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 834c4f9 commit 15ce635

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

sound/soc/intel/boards/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,6 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
681681
select SND_SOC_CS35L56_SDW
682682
select SND_SOC_DMIC
683683
select SND_SOC_INTEL_HDA_DSP_COMMON
684-
select SND_SOC_INTEL_SOF_MAXIM_COMMON
685684
imply SND_SOC_SDW_MOCKUP
686685
help
687686
Add support for Intel SoundWire-based platforms connected to

sound/soc/intel/boards/sof_sdw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2067,4 +2067,3 @@ MODULE_AUTHOR("Rander Wang <[email protected]>");
20672067
MODULE_AUTHOR("Pierre-Louis Bossart <[email protected]>");
20682068
MODULE_LICENSE("GPL v2");
20692069
MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);
2070-
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);

sound/soc/intel/boards/sof_sdw_maxim.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <sound/soc-acpi.h>
1212
#include <sound/soc-dapm.h>
1313
#include "sof_sdw_common.h"
14-
#include "sof_maxim_common.h"
1514

1615
static int maxim_part_id;
1716
#define SOF_SDW_PART_ID_MAX98363 0x8363
@@ -27,6 +26,11 @@ static const struct snd_kcontrol_new maxim_controls[] = {
2726
SOC_DAPM_PIN_SWITCH("Right Spk"),
2827
};
2928

29+
static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {
30+
{ "Left Spk", NULL, "Left BE_OUT" },
31+
{ "Right Spk", NULL, "Right BE_OUT" },
32+
};
33+
3034
int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
3135
{
3236
struct snd_soc_card *card = rtd->card;

0 commit comments

Comments
 (0)