From: Mark Brown <broonie@kernel.org>
Date: Wed, 2 Dec 2015 20:22:31 +0000 (+0000)
Subject: Merge branch 'fix/sun4i-codec' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... 
X-Git-Tag: v4.5-rc1~80^2~26^2~1^2~11^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce3d3f0e43982685c6bf002ae24a267867762e75;p=karo-tx-linux.git

Merge branch 'fix/sun4i-codec' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
---

ce3d3f0e43982685c6bf002ae24a267867762e75
diff --cc sound/soc/sunxi/sun4i-codec.c
index 0dc11f547937,1bb896d78d09..7a3fe1dca178
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@@ -566,24 -453,14 +567,24 @@@ static const struct snd_soc_dapm_widge
  	SND_SOC_DAPM_SUPPLY("Mixer Enable", SUN4I_CODEC_DAC_ACTL,
  			    SUN4I_CODEC_DAC_ACTL_MIXEN, 0, NULL, 0),
  
 +	/* VMIC */
 +	SND_SOC_DAPM_SUPPLY("VMIC", SUN4I_CODEC_ADC_ACTL,
 +			    SUN4I_CODEC_ADC_ACTL_VMICEN, 0, NULL, 0),
 +
 +	/* Mic Pre-Amplifiers */
 +	SND_SOC_DAPM_PGA("MIC1 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL,
 +			 SUN4I_CODEC_ADC_ACTL_PREG1EN, 0, NULL, 0),
 +
- 	/* Pre-Amplifier */
- 	SND_SOC_DAPM_MIXER("Pre-Amplifier", SUN4I_CODEC_ADC_ACTL,
+ 	/* Power Amplifier */
+ 	SND_SOC_DAPM_MIXER("Power Amplifier", SUN4I_CODEC_ADC_ACTL,
  			   SUN4I_CODEC_ADC_ACTL_PA_EN, 0,
  			   sun4i_codec_pa_mixer_controls,
  			   ARRAY_SIZE(sun4i_codec_pa_mixer_controls)),
- 	SND_SOC_DAPM_SWITCH("Pre-Amplifier Mute", SND_SOC_NOPM, 0, 0,
+ 	SND_SOC_DAPM_SWITCH("Power Amplifier Mute", SND_SOC_NOPM, 0, 0,
  			    &sun4i_codec_pa_mute),
  
 +	SND_SOC_DAPM_INPUT("Mic1"),
 +
  	SND_SOC_DAPM_OUTPUT("HP Right"),
  	SND_SOC_DAPM_OUTPUT("HP Left"),
  };
@@@ -606,22 -481,16 +607,22 @@@ static const struct snd_soc_dapm_route 
  	{ "Left Mixer", NULL, "Mixer Enable" },
  	{ "Left Mixer", "Left DAC Playback Switch", "Left DAC" },
  
- 	/* Pre-Amplifier Mixer Routes */
- 	{ "Pre-Amplifier", "Mixer Playback Switch", "Left Mixer" },
- 	{ "Pre-Amplifier", "Mixer Playback Switch", "Right Mixer" },
- 	{ "Pre-Amplifier", "DAC Playback Switch", "Left DAC" },
- 	{ "Pre-Amplifier", "DAC Playback Switch", "Right DAC" },
+ 	/* Power Amplifier Routes */
+ 	{ "Power Amplifier", "Mixer Playback Switch", "Left Mixer" },
+ 	{ "Power Amplifier", "Mixer Playback Switch", "Right Mixer" },
+ 	{ "Power Amplifier", "DAC Playback Switch", "Left DAC" },
+ 	{ "Power Amplifier", "DAC Playback Switch", "Right DAC" },
  
- 	/* PA -> HP path */
- 	{ "Pre-Amplifier Mute", "Switch", "Pre-Amplifier" },
- 	{ "HP Right", NULL, "Pre-Amplifier Mute" },
- 	{ "HP Left", NULL, "Pre-Amplifier Mute" },
+ 	/* Headphone Output Routes */
+ 	{ "Power Amplifier Mute", "Switch", "Power Amplifier" },
+ 	{ "HP Right", NULL, "Power Amplifier Mute" },
+ 	{ "HP Left", NULL, "Power Amplifier Mute" },
 +
 +	/* Mic1 Routes */
 +	{ "Left ADC", NULL, "MIC1 Pre-Amplifier" },
 +	{ "Right ADC", NULL, "MIC1 Pre-Amplifier" },
 +	{ "MIC1 Pre-Amplifier", NULL, "Mic1"},
 +	{ "Mic1", NULL, "VMIC" },
  };
  
  static struct snd_soc_codec_driver sun4i_codec_codec = {