| Message ID | 1393334248-29033-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 52be4776cace06bf3d3df85fa490e61421824051 |
| Headers | show |
On Tue, 2014-02-25 at 15:17 +0200, Jarkko Nikula wrote: > Use more sensible kcontrol names than "Int Mic" and "Ext Spk". Speakers > especially are usually integrated devices in sales models. > > Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> > --- > sound/soc/intel/byt-rt5640.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c > index 038547b48b2d..672fedbfa680 100644 > --- a/sound/soc/intel/byt-rt5640.c > +++ b/sound/soc/intel/byt-rt5640.c > @@ -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; Both Acked-by: Liam Girdwoood <liam.r.girdwood@linux.intel.com>
On Tue, Feb 25, 2014 at 03:17:27PM +0200, Jarkko Nikula wrote: > Use more sensible kcontrol names than "Int Mic" and "Ext Spk". Speakers > especially are usually integrated devices in sales models. Applied both, thanks.
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c index 038547b48b2d..672fedbfa680 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/byt-rt5640.c @@ -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;
Use more sensible kcontrol names than "Int Mic" and "Ext Spk". Speakers especially are usually integrated devices in sales models. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> --- sound/soc/intel/byt-rt5640.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)