Unverified Commit ba499c36 authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files

ASoC: mediatek: mt8192: move rt1015_rt5682 specific data 



Moves rt1015_rt5682 specific data right before the snd_soc_card
definition for neat purpose.

Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201201132614.1691352-4-tzungbi@google.com


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

sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c

+25 −25
Original line number Diff line number Diff line
@@ -33,31 +33,6 @@ 


static struct snd_soc_jack headset_jack;



static const struct snd_soc_dapm_widget

mt8192_mt6359_rt1015_rt5682_widgets[] = {

	SND_SOC_DAPM_SPK("Left Spk", NULL),

	SND_SOC_DAPM_SPK("Right Spk", NULL),

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route mt8192_mt6359_rt1015_rt5682_routes[] = {

	/* speaker */

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

	{ "Right Spk", NULL, "Right SPO" },

	/* headset */

	{ "Headphone Jack", NULL, "HPOL" },

	{ "Headphone Jack", NULL, "HPOR" },

	{ "IN1P", NULL, "Headset Mic" },

};



static const struct snd_kcontrol_new mt8192_mt6359_rt1015_rt5682_controls[] = {

	SOC_DAPM_PIN_SWITCH("Left Spk"),

	SOC_DAPM_PIN_SWITCH("Right Spk"),

	SOC_DAPM_PIN_SWITCH("Headphone Jack"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream,

				       struct snd_pcm_hw_params *params)

{
@@ -971,6 +946,31 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { 
	},

};



static const struct snd_soc_dapm_widget

mt8192_mt6359_rt1015_rt5682_widgets[] = {

	SND_SOC_DAPM_SPK("Left Spk", NULL),

	SND_SOC_DAPM_SPK("Right Spk", NULL),

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route mt8192_mt6359_rt1015_rt5682_routes[] = {

	/* speaker */

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

	{ "Right Spk", NULL, "Right SPO" },

	/* headset */

	{ "Headphone Jack", NULL, "HPOL" },

	{ "Headphone Jack", NULL, "HPOR" },

	{ "IN1P", NULL, "Headset Mic" },

};



static const struct snd_kcontrol_new mt8192_mt6359_rt1015_rt5682_controls[] = {

	SOC_DAPM_PIN_SWITCH("Left Spk"),

	SOC_DAPM_PIN_SWITCH("Right Spk"),

	SOC_DAPM_PIN_SWITCH("Headphone Jack"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static struct snd_soc_codec_conf rt1015_amp_conf[] = {

	{

		.dlc = COMP_CODEC_CONF(RT1015_DEV0_NAME),