Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d179746 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output 



[ Upstream commit dccd1dfd0770bfd494b68d1135b4547b2c602c42 ]

Move the "Platform Clock" routes for the "Internal Mic" and "Speaker"
routes to the intmic_*_map[] / *_spk_map[] arrays.

This ensures that these "Platform Clock" routes do not get added when the
BYT_RT5640_NO_INTERNAL_MIC_MAP / BYT_RT5640_NO_SPEAKERS quirks are used.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210802142501.991985-2-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 37414bd6

sound/soc/intel/boards/bytcr_rt5640.c

+6 −3
Original line number Diff line number Diff line
@@ -284,9 +284,6 @@ static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = { 
static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = {

	{"Headphone", NULL, "Platform Clock"},

	{"Headset Mic", NULL, "Platform Clock"},

	{"Internal Mic", NULL, "Platform Clock"},

	{"Speaker", NULL, "Platform Clock"},



	{"Headset Mic", NULL, "MICBIAS1"},

	{"IN2P", NULL, "Headset Mic"},

	{"Headphone", NULL, "HPOL"},
@@ -294,19 +291,23 @@ static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = { 
};



static const struct snd_soc_dapm_route byt_rt5640_intmic_dmic1_map[] = {

	{"Internal Mic", NULL, "Platform Clock"},

	{"DMIC1", NULL, "Internal Mic"},

};



static const struct snd_soc_dapm_route byt_rt5640_intmic_dmic2_map[] = {

	{"Internal Mic", NULL, "Platform Clock"},

	{"DMIC2", NULL, "Internal Mic"},

};



static const struct snd_soc_dapm_route byt_rt5640_intmic_in1_map[] = {

	{"Internal Mic", NULL, "Platform Clock"},

	{"Internal Mic", NULL, "MICBIAS1"},

	{"IN1P", NULL, "Internal Mic"},

};



static const struct snd_soc_dapm_route byt_rt5640_intmic_in3_map[] = {

	{"Internal Mic", NULL, "Platform Clock"},

	{"Internal Mic", NULL, "MICBIAS1"},

	{"IN3P", NULL, "Internal Mic"},

};
@@ -348,6 +349,7 @@ static const struct snd_soc_dapm_route byt_rt5640_ssp0_aif2_map[] = { 
};



static const struct snd_soc_dapm_route byt_rt5640_stereo_spk_map[] = {

	{"Speaker", NULL, "Platform Clock"},

	{"Speaker", NULL, "SPOLP"},

	{"Speaker", NULL, "SPOLN"},

	{"Speaker", NULL, "SPORP"},
@@ -355,6 +357,7 @@ static const struct snd_soc_dapm_route byt_rt5640_stereo_spk_map[] = { 
};



static const struct snd_soc_dapm_route byt_rt5640_mono_spk_map[] = {

	{"Speaker", NULL, "Platform Clock"},

	{"Speaker", NULL, "SPOLP"},

	{"Speaker", NULL, "SPOLN"},

};