evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: sdm660_cdc: Fix 44.1 clip mute first time after boot"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-23 09:44:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit 64b780b80c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c
View file

@ -3760,8 +3760,8 @@ static int msm_anlg_cdc_device_down(struct snd_soc_codec *codec)
snd_soc_write(codec, snd_soc_write(codec,
MSM89XX_PMIC_ANALOG_SPKR_DAC_CTL, 0x93); MSM89XX_PMIC_ANALOG_SPKR_DAC_CTL, 0x93);
atomic_set(&pdata->int_mclk0_enabled, false);
msm_anlg_cdc_dig_notifier_call(codec, DIG_CDC_EVENT_SSR_DOWN); msm_anlg_cdc_dig_notifier_call(codec, DIG_CDC_EVENT_SSR_DOWN);
atomic_set(&pdata->int_mclk0_enabled, false);
set_bit(BUS_DOWN, &sdm660_cdc_priv->status_mask); set_bit(BUS_DOWN, &sdm660_cdc_priv->status_mask);
snd_soc_card_change_online_state(codec->component.card, 0); snd_soc_card_change_online_state(codec->component.card, 0);
@ -3822,17 +3822,22 @@ static int sdm660_cdc_notifier_service_cb(struct notifier_block *nb,
bool adsp_ready = false; bool adsp_ready = false;
bool timedout; bool timedout;
unsigned long timeout; unsigned long timeout;
static bool initial_boot = true;
codec = sdm660_cdc_priv->codec; codec = sdm660_cdc_priv->codec;
dev_dbg(codec->dev, "%s: Service opcode 0x%lx\n", __func__, opcode); dev_dbg(codec->dev, "%s: Service opcode 0x%lx\n", __func__, opcode);
switch (opcode) { switch (opcode) {
case AUDIO_NOTIFIER_SERVICE_DOWN: case AUDIO_NOTIFIER_SERVICE_DOWN:
if (initial_boot)
break;
dev_dbg(codec->dev, dev_dbg(codec->dev,
"ADSP is about to power down. teardown/reset codec\n"); "ADSP is about to power down. teardown/reset codec\n");
msm_anlg_cdc_device_down(codec); msm_anlg_cdc_device_down(codec);
break; break;
case AUDIO_NOTIFIER_SERVICE_UP: case AUDIO_NOTIFIER_SERVICE_UP:
if (initial_boot)
initial_boot = false;
dev_dbg(codec->dev, dev_dbg(codec->dev,
"ADSP is about to power up. bring up codec\n"); "ADSP is about to power up. bring up codec\n");