|
@@ -29,27 +29,27 @@
|
|
|
static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = {
|
|
|
SND_SOC_DAPM_HP("Headphone", NULL),
|
|
|
SND_SOC_DAPM_MIC("Headset Mic", NULL),
|
|
|
- SND_SOC_DAPM_MIC("Int Mic", NULL),
|
|
|
- SND_SOC_DAPM_SPK("Ext Spk", NULL),
|
|
|
+ SND_SOC_DAPM_MIC("Internal Mic", NULL),
|
|
|
+ SND_SOC_DAPM_SPK("Speaker", NULL),
|
|
|
};
|
|
|
|
|
|
static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = {
|
|
|
{"IN2P", NULL, "Headset Mic"},
|
|
|
{"IN2N", NULL, "Headset Mic"},
|
|
|
- {"DMIC1", NULL, "Int Mic"},
|
|
|
+ {"DMIC1", NULL, "Internal Mic"},
|
|
|
{"Headphone", NULL, "HPOL"},
|
|
|
{"Headphone", NULL, "HPOR"},
|
|
|
- {"Ext Spk", NULL, "SPOLP"},
|
|
|
- {"Ext Spk", NULL, "SPOLN"},
|
|
|
- {"Ext Spk", NULL, "SPORP"},
|
|
|
- {"Ext Spk", NULL, "SPORN"},
|
|
|
+ {"Speaker", NULL, "SPOLP"},
|
|
|
+ {"Speaker", NULL, "SPOLN"},
|
|
|
+ {"Speaker", NULL, "SPORP"},
|
|
|
+ {"Speaker", NULL, "SPORN"},
|
|
|
};
|
|
|
|
|
|
static const struct snd_kcontrol_new byt_rt5640_controls[] = {
|
|
|
SOC_DAPM_PIN_SWITCH("Headphone"),
|
|
|
SOC_DAPM_PIN_SWITCH("Headset Mic"),
|
|
|
- SOC_DAPM_PIN_SWITCH("Int Mic"),
|
|
|
- SOC_DAPM_PIN_SWITCH("Ext Spk"),
|
|
|
+ SOC_DAPM_PIN_SWITCH("Internal Mic"),
|
|
|
+ SOC_DAPM_PIN_SWITCH("Speaker"),
|
|
|
};
|
|
|
|
|
|
static int byt_rt5640_hw_params(struct snd_pcm_substream *substream,
|
|
@@ -113,8 +113,8 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
|
|
|
|
|
|
snd_soc_dapm_enable_pin(dapm, "Headset Mic");
|
|
|
snd_soc_dapm_enable_pin(dapm, "Headphone");
|
|
|
- snd_soc_dapm_enable_pin(dapm, "Ext Spk");
|
|
|
- snd_soc_dapm_enable_pin(dapm, "Int Mic");
|
|
|
+ snd_soc_dapm_enable_pin(dapm, "Speaker");
|
|
|
+ snd_soc_dapm_enable_pin(dapm, "Internal Mic");
|
|
|
|
|
|
snd_soc_dapm_sync(dapm);
|
|
|
return ret;
|