|
@@ -772,6 +772,10 @@ static const struct snd_kcontrol_new sun6i_codec_mixer_controls[] = {
|
|
SUN6I_CODEC_OM_DACA_CTRL,
|
|
SUN6I_CODEC_OM_DACA_CTRL,
|
|
SUN6I_CODEC_OM_DACA_CTRL_LMIX_DACR,
|
|
SUN6I_CODEC_OM_DACA_CTRL_LMIX_DACR,
|
|
SUN6I_CODEC_OM_DACA_CTRL_RMIX_DACL, 1, 0),
|
|
SUN6I_CODEC_OM_DACA_CTRL_RMIX_DACL, 1, 0),
|
|
|
|
+ SOC_DAPM_DOUBLE("Line In Playback Switch",
|
|
|
|
+ SUN6I_CODEC_OM_DACA_CTRL,
|
|
|
|
+ SUN6I_CODEC_OM_DACA_CTRL_LMIX_LINEINL,
|
|
|
|
+ SUN6I_CODEC_OM_DACA_CTRL_RMIX_LINEINR, 1, 0),
|
|
};
|
|
};
|
|
|
|
|
|
/* headphone controls */
|
|
/* headphone controls */
|
|
@@ -793,6 +797,8 @@ static const struct snd_kcontrol_new sun6i_codec_hp_src[] = {
|
|
/* volume / mute controls */
|
|
/* volume / mute controls */
|
|
static const DECLARE_TLV_DB_SCALE(sun6i_codec_dvol_scale, -7308, 116, 0);
|
|
static const DECLARE_TLV_DB_SCALE(sun6i_codec_dvol_scale, -7308, 116, 0);
|
|
static const DECLARE_TLV_DB_SCALE(sun6i_codec_hp_vol_scale, -6300, 100, 1);
|
|
static const DECLARE_TLV_DB_SCALE(sun6i_codec_hp_vol_scale, -6300, 100, 1);
|
|
|
|
+static const DECLARE_TLV_DB_SCALE(sun6i_codec_out_mixer_pregain_scale,
|
|
|
|
+ -450, 150, 0);
|
|
|
|
|
|
static const struct snd_kcontrol_new sun6i_codec_codec_widgets[] = {
|
|
static const struct snd_kcontrol_new sun6i_codec_codec_widgets[] = {
|
|
SOC_SINGLE_TLV("DAC Playback Volume", SUN4I_CODEC_DAC_DPC,
|
|
SOC_SINGLE_TLV("DAC Playback Volume", SUN4I_CODEC_DAC_DPC,
|
|
@@ -806,9 +812,16 @@ static const struct snd_kcontrol_new sun6i_codec_codec_widgets[] = {
|
|
SUN6I_CODEC_OM_DACA_CTRL,
|
|
SUN6I_CODEC_OM_DACA_CTRL,
|
|
SUN6I_CODEC_OM_DACA_CTRL_LHPPAMUTE,
|
|
SUN6I_CODEC_OM_DACA_CTRL_LHPPAMUTE,
|
|
SUN6I_CODEC_OM_DACA_CTRL_RHPPAMUTE, 1, 0),
|
|
SUN6I_CODEC_OM_DACA_CTRL_RHPPAMUTE, 1, 0),
|
|
|
|
+ /* Mixer pre-gains */
|
|
|
|
+ SOC_SINGLE_TLV("Line In Playback Volume",
|
|
|
|
+ SUN6I_CODEC_OM_PA_CTRL, SUN6I_CODEC_OM_PA_CTRL_LINEING,
|
|
|
|
+ 0x7, 0, sun6i_codec_out_mixer_pregain_scale),
|
|
};
|
|
};
|
|
|
|
|
|
static const struct snd_soc_dapm_widget sun6i_codec_codec_dapm_widgets[] = {
|
|
static const struct snd_soc_dapm_widget sun6i_codec_codec_dapm_widgets[] = {
|
|
|
|
+ /* Line In */
|
|
|
|
+ SND_SOC_DAPM_INPUT("LINEIN"),
|
|
|
|
+
|
|
/* Digital parts of the DACs */
|
|
/* Digital parts of the DACs */
|
|
SND_SOC_DAPM_SUPPLY("DAC Enable", SUN4I_CODEC_DAC_DPC,
|
|
SND_SOC_DAPM_SUPPLY("DAC Enable", SUN4I_CODEC_DAC_DPC,
|
|
SUN4I_CODEC_DAC_DPC_EN_DA, 0,
|
|
SUN4I_CODEC_DAC_DPC_EN_DA, 0,
|
|
@@ -850,10 +863,12 @@ static const struct snd_soc_dapm_route sun6i_codec_codec_dapm_routes[] = {
|
|
/* Left Mixer Routes */
|
|
/* Left Mixer Routes */
|
|
{ "Left Mixer", "DAC Playback Switch", "Left DAC" },
|
|
{ "Left Mixer", "DAC Playback Switch", "Left DAC" },
|
|
{ "Left Mixer", "DAC Reversed Playback Switch", "Right DAC" },
|
|
{ "Left Mixer", "DAC Reversed Playback Switch", "Right DAC" },
|
|
|
|
+ { "Left Mixer", "Line In Playback Switch", "LINEIN" },
|
|
|
|
|
|
/* Right Mixer Routes */
|
|
/* Right Mixer Routes */
|
|
{ "Right Mixer", "DAC Playback Switch", "Right DAC" },
|
|
{ "Right Mixer", "DAC Playback Switch", "Right DAC" },
|
|
{ "Right Mixer", "DAC Reversed Playback Switch", "Left DAC" },
|
|
{ "Right Mixer", "DAC Reversed Playback Switch", "Left DAC" },
|
|
|
|
+ { "Right Mixer", "Line In Playback Switch", "LINEIN" },
|
|
|
|
|
|
/* Headphone Routes */
|
|
/* Headphone Routes */
|
|
{ "Headphone Source Playback Route", "DAC", "Left DAC" },
|
|
{ "Headphone Source Playback Route", "DAC", "Left DAC" },
|