tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Intel: boards: align pin names between byt-rt5640 drivers
initial cleanup to use same pins
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Pierre-Louis Bossart
and committed by
Mark Brown
e2be1da0
3f27dedd
+11
-12
+11
-12
sound/soc/intel/boards/bytcr_rt5640.c
+11
-12
sound/soc/intel/boards/bytcr_rt5640.c
···
32
32
static const struct snd_soc_dapm_widget byt_dapm_widgets[] = {
33
33
SND_SOC_DAPM_HP("Headphone", NULL),
34
34
SND_SOC_DAPM_MIC("Headset Mic", NULL),
35
-
SND_SOC_DAPM_MIC("Int Mic", NULL),
36
-
SND_SOC_DAPM_SPK("Ext Spk", NULL),
35
+
SND_SOC_DAPM_MIC("Internal Mic", NULL),
36
+
SND_SOC_DAPM_SPK("Speaker", NULL),
37
37
};
38
38
39
39
static const struct snd_soc_dapm_route byt_audio_map[] = {
40
-
{"IN2P", NULL, "Headset Mic"},
41
-
{"IN2N", NULL, "Headset Mic"},
42
40
{"Headset Mic", NULL, "MICBIAS1"},
43
-
{"IN1P", NULL, "MICBIAS1"},
44
-
{"LDO2", NULL, "Int Mic"},
41
+
{"IN2P", NULL, "Headset Mic"},
45
42
{"Headphone", NULL, "HPOL"},
46
43
{"Headphone", NULL, "HPOR"},
47
-
{"Ext Spk", NULL, "SPOLP"},
48
-
{"Ext Spk", NULL, "SPOLN"},
49
-
{"Ext Spk", NULL, "SPORP"},
50
-
{"Ext Spk", NULL, "SPORN"},
44
+
{"Speaker", NULL, "SPOLP"},
45
+
{"Speaker", NULL, "SPOLN"},
46
+
{"Speaker", NULL, "SPORP"},
47
+
{"Speaker", NULL, "SPORN"},
48
+
{"Internal Mic", NULL, "MICBIAS1"},
49
+
{"IN1P", NULL, "Internal Mic"},
51
50
52
51
{"AIF1 Playback", NULL, "ssp2 Tx"},
53
52
{"ssp2 Tx", NULL, "codec_out0"},
···
59
60
static const struct snd_kcontrol_new byt_mc_controls[] = {
60
61
SOC_DAPM_PIN_SWITCH("Headphone"),
61
62
SOC_DAPM_PIN_SWITCH("Headset Mic"),
62
-
SOC_DAPM_PIN_SWITCH("Int Mic"),
63
-
SOC_DAPM_PIN_SWITCH("Ext Spk"),
63
+
SOC_DAPM_PIN_SWITCH("Internal Mic"),
64
+
SOC_DAPM_PIN_SWITCH("Speaker"),
64
65
};
65
66
66
67
static int byt_aif1_hw_params(struct snd_pcm_substream *substream,