Commit 6719cd5e authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Takashi Iwai

ALSA: scarlett2: Fix Scarlett 4th Gen input gain range again

The 4th Gen input preamp gain range is 0dB to +69dB, although the
control values range from 0 to 70. Replace SCARLETT2_MAX_GAIN with
SCARLETT2_MAX_GAIN_VALUE and SCARLETT2_MAX_GAIN_DB, and update the TLV
again.
Signed-off-by: default avatarGeoffrey D. Bennett <g@b4.vu>
Fixes: a45cf0a0 ("ALSA: scarlett2: Fix Scarlett 4th Gen input gain range")
Message-ID: <Ze7OMA8ntG7KteGa@m.b4.vu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a45cf0a0
...@@ -174,8 +174,11 @@ ...@@ -174,8 +174,11 @@
/* some gui mixers can't handle negative ctl values */ /* some gui mixers can't handle negative ctl values */
#define SCARLETT2_VOLUME_BIAS 127 #define SCARLETT2_VOLUME_BIAS 127
/* maximum preamp input gain */ /* maximum preamp input gain and value
#define SCARLETT2_MAX_GAIN 70 * values are from 0 to 70, preamp gain is from 0 to 69 dB
*/
#define SCARLETT2_MAX_GAIN_VALUE 70
#define SCARLETT2_MAX_GAIN_DB 69
/* mixer range from -80dB to +6dB in 0.5dB steps */ /* mixer range from -80dB to +6dB in 0.5dB steps */
#define SCARLETT2_MIXER_MIN_DB -80 #define SCARLETT2_MIXER_MIN_DB -80
...@@ -3466,7 +3469,7 @@ static int scarlett2_input_gain_ctl_info(struct snd_kcontrol *kctl, ...@@ -3466,7 +3469,7 @@ static int scarlett2_input_gain_ctl_info(struct snd_kcontrol *kctl,
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = elem->channels; uinfo->count = elem->channels;
uinfo->value.integer.min = 0; uinfo->value.integer.min = 0;
uinfo->value.integer.max = SCARLETT2_MAX_GAIN; uinfo->value.integer.max = SCARLETT2_MAX_GAIN_VALUE;
uinfo->value.integer.step = 1; uinfo->value.integer.step = 1;
unlock: unlock:
...@@ -3543,7 +3546,7 @@ static int scarlett2_input_gain_ctl_put(struct snd_kcontrol *kctl, ...@@ -3543,7 +3546,7 @@ static int scarlett2_input_gain_ctl_put(struct snd_kcontrol *kctl,
} }
static const DECLARE_TLV_DB_MINMAX( static const DECLARE_TLV_DB_MINMAX(
db_scale_scarlett2_gain, 0, SCARLETT2_MAX_GAIN * 100 db_scale_scarlett2_gain, 0, SCARLETT2_MAX_GAIN_DB * 100
); );
static const struct snd_kcontrol_new scarlett2_input_gain_ctl = { static const struct snd_kcontrol_new scarlett2_input_gain_ctl = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment