diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-31 04:42:29 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-31 04:42:29 -0800 |
| commit | f2ab5923b10c5057f57a7c9d5bac55449b81b4f3 (patch) | |
| tree | e292369ebb176b1e48aa6236680a8c90ab813c79 /sound/soc | |
| parent | 7949ac69d25195526b0913b65dc95a222b1c28b7 (diff) | |
| parent | fd41762a7972406b141d206326154dc467c0ec33 (diff) | |
Merge "ASoC: wcd: Fix ADSP based SVA mode detection failures"
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c | 8 | ||||
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/wcd9xxx-resmgr-v2.c | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c b/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c index aa180fa3159f..e791bf07ec67 100644 --- a/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c +++ b/sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2017, 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 @@ -607,8 +607,6 @@ static void wcd_cntl_do_shutdown(struct wcd_dsp_cntl *cntl) /* Disable WDOG */ snd_soc_update_bits(codec, WCD934X_CPE_SS_WDOG_CFG, 0x3F, 0x01); - snd_soc_update_bits(codec, WCD934X_CODEC_RPM_CLK_MCLK_CFG, - 0x04, 0x00); /* Put WDSP in reset state */ snd_soc_update_bits(codec, WCD934X_CPE_SS_CPE_CTL, @@ -633,11 +631,7 @@ static int wcd_cntl_do_boot(struct wcd_dsp_cntl *cntl) if (cntl->debug_mode) { snd_soc_update_bits(codec, WCD934X_CPE_SS_WDOG_CFG, 0x3F, 0x01); - snd_soc_update_bits(codec, WCD934X_CODEC_RPM_CLK_MCLK_CFG, - 0x04, 0x00); } else { - snd_soc_update_bits(codec, WCD934X_CODEC_RPM_CLK_MCLK_CFG, - 0x04, 0x04); snd_soc_update_bits(codec, WCD934X_CPE_SS_WDOG_CFG, 0x3F, 0x21); } diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c index 0030b1fcf773..c5d2b1ce8151 100644 --- a/sound/soc/codecs/wcd934x/wcd934x.c +++ b/sound/soc/codecs/wcd934x/wcd934x.c @@ -2619,6 +2619,8 @@ static int __tavil_codec_enable_mad(struct snd_soc_codec *codec, bool enable) /* Undo reset for MAD */ snd_soc_update_bits(codec, WCD934X_CPE_SS_MAD_CTL, 0x02, 0x00); + snd_soc_update_bits(codec, WCD934X_CODEC_RPM_CLK_MCLK_CFG, + 0x04, 0x04); } else { snd_soc_update_bits(codec, WCD934X_SOC_MAD_AUDIO_CTL_2, 0x03, 0x00); @@ -2628,6 +2630,8 @@ static int __tavil_codec_enable_mad(struct snd_soc_codec *codec, bool enable) /* Turn off MAD clk */ snd_soc_update_bits(codec, WCD934X_CPE_SS_MAD_CTL, 0x01, 0x00); + snd_soc_update_bits(codec, WCD934X_CODEC_RPM_CLK_MCLK_CFG, + 0x04, 0x00); } done: return rc; diff --git a/sound/soc/codecs/wcd9xxx-resmgr-v2.c b/sound/soc/codecs/wcd9xxx-resmgr-v2.c index 71edded182e0..2d9a5101dd95 100644 --- a/sound/soc/codecs/wcd9xxx-resmgr-v2.c +++ b/sound/soc/codecs/wcd9xxx-resmgr-v2.c @@ -263,9 +263,6 @@ static int wcd_resmgr_enable_clk_mclk(struct wcd9xxx_resmgr_v2 *resmgr) WCD93XX_CDC_CLK_RST_CTRL_MCLK_CONTROL, 0x01, 0x01); wcd_resmgr_codec_reg_update_bits(resmgr, - WCD934X_CODEC_RPM_CLK_MCLK_CFG, - 0x04, 0x04); - wcd_resmgr_codec_reg_update_bits(resmgr, WCD93XX_CDC_CLK_RST_CTRL_MCLK_CONTROL, 0x01, 0x01); wcd_resmgr_codec_reg_update_bits(resmgr, |