Unverified Commit 9c5046e4 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: boards: create sof-maxim-common module 



sof_maxim_common.o is linked twice, move to a dedicated module.

Also clean-up interfaces to use a consistent 'max_98373' prefix for
all symbols.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20210505163705.305616-7-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES 
config SND_SOC_INTEL_HDA_DSP_COMMON

	tristate



config SND_SOC_INTEL_SOF_MAXIM_COMMON

	tristate



if SND_SOC_INTEL_CATPT



config SND_SOC_INTEL_HASWELL_MACH
@@ -469,6 +472,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	help

	   This adds support for ASoC machine driver for SOF platforms

	   with rt5682 codec.
@@ -579,6 +583,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT5682_SDW

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	help

	  Add support for Intel SoundWire-based platforms connected to

	  MAX98373, RT700, RT711, RT1308 and RT715

sound/soc/intel/boards/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ snd-soc-sst-byt-cht-cx2072x-objs := bytcht_cx2072x.o 
snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o

snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o

snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o

snd-soc-sof_rt5682-objs := sof_rt5682.o sof_maxim_common.o sof_realtek_common.o

snd-soc-sof_rt5682-objs := sof_rt5682.o sof_realtek_common.o

snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o

snd-soc-kbl_da7219_max98357a-objs := kbl_da7219_max98357a.o

snd-soc-kbl_da7219_max98927-objs := kbl_da7219_max98927.o
@@ -38,7 +38,6 @@ snd-soc-sof-sdw-objs += sof_sdw.o \ 
			sof_sdw_rt5682.o sof_sdw_rt700.o	\

			sof_sdw_rt711.o sof_sdw_rt711_sdca.o 	\

			sof_sdw_rt715.o	sof_sdw_rt715_sdca.o 	\

			sof_maxim_common.o                      \

			sof_sdw_dmic.o sof_sdw_hdmi.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o

obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
@@ -78,3 +77,6 @@ obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o 
# common modules

snd-soc-intel-hda-dsp-common-objs := hda_dsp_common.o

obj-$(CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON) += snd-soc-intel-hda-dsp-common.o



snd-soc-intel-sof-maxim-common-objs += sof_maxim_common.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON) += snd-soc-intel-sof-maxim-common.o

sound/soc/intel/boards/sof_maxim_common.c

+17 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

//

// Copyright(c) 2020 Intel Corporation. All rights reserved.

#include <linux/module.h>

#include <linux/string.h>

#include <sound/pcm.h>

#include <sound/soc.h>
@@ -16,6 +17,7 @@ const struct snd_soc_dapm_route max_98373_dapm_routes[] = { 
	{ "Left Spk", NULL, "Left BE_OUT" },

	{ "Right Spk", NULL, "Right BE_OUT" },

};

EXPORT_SYMBOL_NS(max_98373_dapm_routes, SND_SOC_INTEL_SOF_MAXIM_COMMON);



static struct snd_soc_codec_conf max_98373_codec_conf[] = {

	{
@@ -38,8 +40,9 @@ struct snd_soc_dai_link_component max_98373_components[] = { 
		.dai_name = MAX_98373_CODEC_DAI,

	},

};

EXPORT_SYMBOL_NS(max_98373_components, SND_SOC_INTEL_SOF_MAXIM_COMMON);



static int max98373_hw_params(struct snd_pcm_substream *substream,

static int max_98373_hw_params(struct snd_pcm_substream *substream,

			       struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
@@ -59,7 +62,7 @@ static int max98373_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



int max98373_trigger(struct snd_pcm_substream *substream, int cmd)

int max_98373_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *codec_dai;
@@ -102,13 +105,15 @@ int max98373_trigger(struct snd_pcm_substream *substream, int cmd) 


	return ret;

}

EXPORT_SYMBOL_NS(max_98373_trigger, SND_SOC_INTEL_SOF_MAXIM_COMMON);



struct snd_soc_ops max_98373_ops = {

	.hw_params = max98373_hw_params,

	.trigger = max98373_trigger,

	.hw_params = max_98373_hw_params,

	.trigger = max_98373_trigger,

};

EXPORT_SYMBOL_NS(max_98373_ops, SND_SOC_INTEL_SOF_MAXIM_COMMON);



int max98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd)

int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;
@@ -119,9 +124,14 @@ int max98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd) 
		dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret);

	return ret;

}

EXPORT_SYMBOL_NS(max_98373_spk_codec_init, SND_SOC_INTEL_SOF_MAXIM_COMMON);



void sof_max98373_codec_conf(struct snd_soc_card *card)

void max_98373_set_codec_conf(struct snd_soc_card *card)

{

	card->codec_conf = max_98373_codec_conf;

	card->num_configs = ARRAY_SIZE(max_98373_codec_conf);

}

EXPORT_SYMBOL_NS(max_98373_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON);



MODULE_DESCRIPTION("ASoC Intel SOF Maxim helpers");

MODULE_LICENSE("GPL");

sound/soc/intel/boards/sof_maxim_common.h

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ extern struct snd_soc_dai_link_component max_98373_components[2]; 
extern struct snd_soc_ops max_98373_ops;

extern const struct snd_soc_dapm_route max_98373_dapm_routes[];



int max98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd);

void sof_max98373_codec_conf(struct snd_soc_card *card);

int max98373_trigger(struct snd_pcm_substream *substream, int cmd);

int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd);

void max_98373_set_codec_conf(struct snd_soc_card *card);

int max_98373_trigger(struct snd_pcm_substream *substream, int cmd);



#endif /* __SOF_MAXIM_COMMON_H */

sound/soc/intel/boards/sof_rt5682.c

+3 −2
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
				SOF_MAX98373_SPEAKER_AMP_PRESENT) {

			links[id].codecs = max_98373_components;

			links[id].num_codecs = ARRAY_SIZE(max_98373_components);

			links[id].init = max98373_spk_codec_init;

			links[id].init = max_98373_spk_codec_init;

			links[id].ops = &max_98373_ops;

			/* feedback stream */

			links[id].dpcm_capture = 1;
@@ -902,7 +902,7 @@ static int sof_audio_probe(struct platform_device *pdev) 
		sof_audio_card_rt5682.num_links++;



	if (sof_rt5682_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT)

		sof_max98373_codec_conf(&sof_audio_card_rt5682);

		max_98373_set_codec_conf(&sof_audio_card_rt5682);

	else if (sof_rt5682_quirk & SOF_RT1011_SPEAKER_AMP_PRESENT)

		sof_rt1011_codec_conf(&sof_audio_card_rt5682);

	else if (sof_rt5682_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT)
@@ -1055,3 +1055,4 @@ MODULE_ALIAS("platform:jsl_rt5682_rt1015p"); 
MODULE_ALIAS("platform:adl_max98373_rt5682");

MODULE_ALIAS("platform:adl_max98357a_rt5682");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);