Unverified Commit 542d7050 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: code refactor for max98360a 



Refactor the machine driver by using the common code in maxim-common
module to support max98360a.

Reviewed-by: default avatarBard Liao <bard.liao@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/20210712203240.46960-5-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_rt5682.c

+1 −51
Original line number Diff line number Diff line
@@ -456,10 +456,6 @@ static const struct snd_kcontrol_new sof_controls[] = { 


};



static const struct snd_kcontrol_new speaker_controls[] = {

	SOC_DAPM_PIN_SWITCH("Spk"),

};



static const struct snd_soc_dapm_widget sof_widgets[] = {

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -467,10 +463,6 @@ static const struct snd_soc_dapm_widget sof_widgets[] = { 
	SND_SOC_DAPM_SPK("Right Spk", NULL),

};



static const struct snd_soc_dapm_widget speaker_widgets[] = {

	SND_SOC_DAPM_SPK("Spk", NULL),

};



static const struct snd_soc_dapm_widget dmic_widgets[] = {

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),

};
@@ -484,11 +476,6 @@ static const struct snd_soc_dapm_route sof_map[] = { 
	{ "IN1P", NULL, "Headset Mic" },

};



static const struct snd_soc_dapm_route speaker_map[] = {

	/* speaker */

	{ "Spk", NULL, "Speaker" },

};



static const struct snd_soc_dapm_route speaker_map_lr[] = {

	{ "Left Spk", NULL, "Left SPO" },

	{ "Right Spk", NULL, "Right SPO" },
@@ -505,34 +492,6 @@ static int speaker_codec_init_lr(struct snd_soc_pcm_runtime *rtd) 
				       ARRAY_SIZE(speaker_map_lr));

}



static int speaker_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	ret = snd_soc_dapm_new_controls(&card->dapm, speaker_widgets,

					ARRAY_SIZE(speaker_widgets));

	if (ret) {

		dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret);

		/* Don't need to add routes if widget addition failed */

		return ret;

	}



	ret = snd_soc_add_card_controls(card, speaker_controls,

					ARRAY_SIZE(speaker_controls));

	if (ret) {

		dev_err(rtd->dev, "unable to add card controls, ret %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, speaker_map,

				      ARRAY_SIZE(speaker_map));



	if (ret)

		dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret);

	return ret;

}



static int dmic_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;
@@ -594,13 +553,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { 
	}

};



static struct snd_soc_dai_link_component max98360a_component[] = {

	{

		.name = "MX98360A:00",

		.dai_name = "HiFi",

	}

};



static struct snd_soc_dai_link_component rt1015_components[] = {

	{

		.name = "i2c-10EC1015:00",
@@ -775,9 +727,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
			links[id].dpcm_capture = 1;

		} else if (sof_rt5682_quirk &

				SOF_MAX98360A_SPEAKER_AMP_PRESENT) {

			links[id].codecs = max98360a_component;

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

			links[id].init = speaker_codec_init;

			max_98360a_dai_link(&links[id]);

		} else if (sof_rt5682_quirk &

				SOF_RT1011_SPEAKER_AMP_PRESENT) {

			sof_rt1011_dai_link(&links[id]);