diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-19 09:52:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-19 09:52:34 -0800 |
| commit | 1a40ab7429f2c4e017643c9130012d2fedccdfad (patch) | |
| tree | b556be0b5bac364665b5711a66726a6fda3af758 | |
| parent | 8d1bf18c09ed1978b24690440b24f68846d6f823 (diff) | |
| parent | 58a3fb7798313e2b95dccde379a93c8d25a7f1f6 (diff) | |
Merge "ASoC: wcd934x: Fix headphone playback mute"
| -rw-r--r-- | sound/soc/codecs/wcd9xxx-resmgr-v2.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/codecs/wcd9xxx-resmgr-v2.c b/sound/soc/codecs/wcd9xxx-resmgr-v2.c index 84754b8d09b0..71edded182e0 100644 --- a/sound/soc/codecs/wcd9xxx-resmgr-v2.c +++ b/sound/soc/codecs/wcd9xxx-resmgr-v2.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-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 @@ -247,9 +247,15 @@ static int wcd_resmgr_enable_clk_mclk(struct wcd9xxx_resmgr_v2 *resmgr) * to CLK_SYS_MCLK_PRG */ wcd_resmgr_codec_reg_update_bits(resmgr, + WCD934X_CLK_SYS_MCLK_PRG, 0x91, 0x91); + wcd_resmgr_codec_reg_update_bits(resmgr, WCD934X_CLK_SYS_MCLK_PRG, 0x02, 0x00); wcd_resmgr_codec_reg_update_bits(resmgr, - WCD934X_CLK_SYS_MCLK_PRG, 0x91, 0x91); + WCD934X_CLK_SYS_INT_CLK_TEST2, 0x04, + 0x04); + wcd_resmgr_codec_reg_update_bits(resmgr, + WCD934X_CLK_SYS_INT_CLK_TEST2, 0x04, + 0x00); wcd_resmgr_codec_reg_update_bits(resmgr, WCD93XX_CDC_CLK_RST_CTRL_FS_CNT_CONTROL, 0x01, 0x01); |