From 077589df00b2ec7579ce61858e93b589f5b56b53 Mon Sep 17 00:00:00 2001 From: Bhalchandra Gajare Date: Tue, 27 Mar 2018 18:45:49 -0700 Subject: [PATCH] ASoC: wcd934x: enable MAD fs_cntr by default Currently, the fs_cntr for MAD is enabled whenever the MAD audio path is enabled. But, a new issue is reported where MAD fs_cntr is required even for some of the non-MAD paths. As per hardware requirements, enable the MAD fs_cntr always from the codec default registers. Change-Id: I6fe8f663b82e711b4194aa51a3e21150aa98cf02 Signed-off-by: Bhalchandra Gajare --- asoc/codecs/wcd934x/wcd934x.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c index e268a734c1..44f741e795 100644 --- a/asoc/codecs/wcd934x/wcd934x.c +++ b/asoc/codecs/wcd934x/wcd934x.c @@ -3174,8 +3174,6 @@ 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); @@ -3185,8 +3183,6 @@ 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; @@ -9416,6 +9412,7 @@ static const struct tavil_reg_mask_val tavil_codec_reg_defaults[] = { {WCD934X_HPH_R_TEST, 0x01, 0x01}, {WCD934X_CPE_FLL_CONFIG_CTL_2, 0xFF, 0x20}, {WCD934X_MBHC_NEW_CTL_2, 0x0C, 0x00}, + {WCD934X_CODEC_RPM_CLK_MCLK_CFG, 0x04, 0x04}, }; static const struct tavil_reg_mask_val tavil_codec_reg_init_1_1_val[] = {