diff options
| author | Bard Liao <bardliao@realtek.com> | 2017-06-29 20:07:50 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-30 12:36:38 +0100 |
| commit | b059ca720e2ac04380240500eb8d8ba931898570 (patch) | |
| tree | 8923e0e60aca973096ae97db142a45b179953f01 /sound | |
| parent | 18fe7869764c0b86e8ce6539bbb6e528f1d9928f (diff) | |
| download | talos-obmc-linux-b059ca720e2ac04380240500eb8d8ba931898570.tar.gz talos-obmc-linux-b059ca720e2ac04380240500eb8d8ba931898570.zip | |
ASoC: rt5665: calibration should be done before jack detection
We will set some volatile registers in jack detection function. But
those volatile registers will be clear in rt5665_calibrate function
because we set cache bypass and reset codec in rt5665_calibrate function.
This patch add a flag to make sure that rt5665_calibrate is done
before starting jack detection.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5665.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 7420010fd8e9..370ed54d1e15 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -70,6 +70,7 @@ struct rt5665_priv { int jack_type; int irq_work_delay_time; unsigned int sar_adc_value; + bool calibration_done; }; static const struct reg_default rt5665_reg[] = { @@ -1305,6 +1306,11 @@ static void rt5665_jack_detect_handler(struct work_struct *work) usleep_range(10000, 15000); } + while (!rt5665->calibration_done) { + pr_debug("%s calibration not ready\n", __func__); + usleep_range(10000, 15000); + } + mutex_lock(&rt5665->calibrate_mutex); val = snd_soc_read(rt5665->codec, RT5665_AJD1_CTRL) & 0x0010; @@ -4695,6 +4701,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665) regmap_write(rt5665->regmap, RT5665_ASRC_8, 0x0120); out_unlock: + rt5665->calibration_done = true; mutex_unlock(&rt5665->calibrate_mutex); } |
