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

Commit e2be1da0 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: boards: align pin names between byt-rt5640 drivers 



initial cleanup to use same pins

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3f27dedd

sound/soc/intel/boards/bytcr_rt5640.c

+11 −12
Original line number Original line Diff line number Diff line
@@ -32,22 +32,21 @@ 
static const struct snd_soc_dapm_widget byt_dapm_widgets[] = {

static const struct snd_soc_dapm_widget byt_dapm_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Int Mic", NULL),

	SND_SOC_DAPM_MIC("Internal Mic", NULL),

	SND_SOC_DAPM_SPK("Ext Spk", NULL),

	SND_SOC_DAPM_SPK("Speaker", NULL),

};

};





static const struct snd_soc_dapm_route byt_audio_map[] = {

static const struct snd_soc_dapm_route byt_audio_map[] = {

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

	{"IN2N", NULL, "Headset Mic"},

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

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

	{"IN1P", NULL, "MICBIAS1"},

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

	{"LDO2", NULL, "Int Mic"},

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

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

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

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

	{"Ext Spk", NULL, "SPOLP"},

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

	{"Ext Spk", NULL, "SPOLN"},

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

	{"Ext Spk", NULL, "SPORP"},

	{"Speaker", NULL, "SPORP"},

	{"Ext Spk", NULL, "SPORN"},

	{"Speaker", NULL, "SPORN"},

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

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





	{"AIF1 Playback", NULL, "ssp2 Tx"},

	{"AIF1 Playback", NULL, "ssp2 Tx"},

	{"ssp2 Tx", NULL, "codec_out0"},

	{"ssp2 Tx", NULL, "codec_out0"},
@@ -60,8 +59,8 @@ static const struct snd_soc_dapm_route byt_audio_map[] = { 
static const struct snd_kcontrol_new byt_mc_controls[] = {

static const struct snd_kcontrol_new byt_mc_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Int Mic"),

	SOC_DAPM_PIN_SWITCH("Internal Mic"),

	SOC_DAPM_PIN_SWITCH("Ext Spk"),

	SOC_DAPM_PIN_SWITCH("Speaker"),

};

};





static int byt_aif1_hw_params(struct snd_pcm_substream *substream,

static int byt_aif1_hw_params(struct snd_pcm_substream *substream,