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

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

Merge "ASoC: wcd9335: avoid changing FS counter with SRW master clk"

parents cb09b8ea 778ce72e

sound/soc/codecs/wcd9335.c

+0 −6
Original line number Diff line number Diff line
@@ -9486,9 +9486,6 @@ static int tasha_swrm_clock(void *handle, bool enable) 
		tasha->swr_clk_users++;

		if (tasha->swr_clk_users == 1) {

			__tasha_cdc_mclk_enable(tasha, true);

			wcd9xxx_reg_update_bits(&tasha->wcd9xxx->core_res,

				WCD9335_CDC_CLK_RST_CTRL_FS_CNT_CONTROL,

				0x01, 0x01);

			wcd9xxx_reg_update_bits(&tasha->wcd9xxx->core_res,

				WCD9335_CDC_CLK_RST_CTRL_SWR_CONTROL,

				0x01, 0x01);
@@ -9499,9 +9496,6 @@ static int tasha_swrm_clock(void *handle, bool enable) 
			wcd9xxx_reg_update_bits(&tasha->wcd9xxx->core_res,

				WCD9335_CDC_CLK_RST_CTRL_SWR_CONTROL,

				0x01, 0x00);

			wcd9xxx_reg_update_bits(&tasha->wcd9xxx->core_res,

				WCD9335_CDC_CLK_RST_CTRL_FS_CNT_CONTROL,

				0x01, 0x00);

			__tasha_cdc_mclk_enable(tasha, false);

		}

	}