Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a40ab74 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd934x: Fix headphone playback mute"

parents 8d1bf18c 58a3fb77

sound/soc/codecs/wcd9xxx-resmgr-v2.c

+8 −2
Original line number Diff line number Diff line 
/*

 * 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
@@ -246,10 +246,16 @@ static int wcd_resmgr_enable_clk_mclk(struct wcd9xxx_resmgr_v2 *resmgr) 
			 * In tavil clock contrl register is changed

			 * 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);