Merge branch 'fix/sun4i-codec' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
This commit is contained in:
Коммит
ce3d3f0e43
|
@ -2,6 +2,7 @@
|
|||
* Copyright 2014 Emilio López <emilio@elopez.com.ar>
|
||||
* Copyright 2014 Jon Smirl <jonsmirl@gmail.com>
|
||||
* Copyright 2015 Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
* Copyright 2015 Adam Sampson <ats@offog.org>
|
||||
*
|
||||
* Based on the Allwinner SDK driver, released under the GPL.
|
||||
*
|
||||
|
@ -507,7 +508,7 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
|
|||
static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
|
||||
|
||||
static const struct snd_kcontrol_new sun4i_codec_widgets[] = {
|
||||
SOC_SINGLE_TLV("PA Volume", SUN4I_CODEC_DAC_ACTL,
|
||||
SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
|
||||
SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,
|
||||
sun4i_codec_pa_volume_scale),
|
||||
};
|
||||
|
@ -574,12 +575,12 @@ static const struct snd_soc_dapm_widget sun4i_codec_dapm_widgets[] = {
|
|||
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"),
|
||||
|
@ -606,16 +607,16 @@ static const struct snd_soc_dapm_route sun4i_codec_dapm_routes[] = {
|
|||
{ "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" },
|
||||
|
|
Загрузка…
Ссылка в новой задаче