diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-06 02:07:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-06 02:07:11 -0700 |
| commit | 86d96481ed54d52508b196c2d1613fe2f6369953 (patch) | |
| tree | cf5b038b8244eea6336def832d8852f742174c0f | |
| parent | fb913f564f56aade71edf3735cffd35c511aa79c (diff) | |
| parent | c97bf10fd24899f37e1d6241cb651743697ed1ea (diff) | |
Merge "ASoC: sdm660_cdc: Fix pop after PDR on SDM660 internal codec"
| -rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c index 55eef61a01de..fe455c9b8c25 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -3805,12 +3805,11 @@ static int msm_anlg_cdc_device_down(struct snd_soc_codec *codec) } msm_anlg_cdc_boost_off(codec); sdm660_cdc_priv->hph_mode = NORMAL_MODE; - - /* 40ms to allow boost to discharge */ - msleep(40); /* Disable PA to avoid pop during codec bring up */ snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_RX_HPH_CNP_EN, 0x30, 0x00); + /* 40ms to allow boost to discharge */ + msleep(40); snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_SPKR_DRV_CTL, 0x80, 0x00); snd_soc_write(codec, |