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

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

Merge "asoc: wcd937x: Disable EN_CUR_DET bit for receiver noise"

parents 6ea70ba3 01229c98

asoc/codecs/wcd-clsh.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, 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
@@ -206,6 +206,8 @@ static void wcd_clsh_flyback_ctrl(struct snd_soc_codec *codec, 
	/* enable/disable flyback */

	if ((enable && (++clsh_d->flyback_users == 1)) ||

	   (!enable && (--clsh_d->flyback_users == 0))) {

		snd_soc_update_bits(codec, WCD9XXX_FLYBACK_VNEG_CTRL_1,

				    0xE0, 0xE0);

		snd_soc_update_bits(codec, WCD9XXX_ANA_RX_SUPPLIES,

				    (1 << 6), (enable << 6));

		/*

asoc/codecs/wcd937x/wcd937x.c

+4 −0
Original line number Diff line number Diff line
@@ -548,6 +548,8 @@ static int wcd937x_codec_ear_dac_event(struct snd_soc_dapm_widget *w, 
		snd_soc_update_bits(codec, WCD937X_DIGITAL_CDC_COMP_CTL_0,

				    0x02, 0x02);

		usleep_range(5000, 5010);

		snd_soc_update_bits(codec, WCD937X_FLYBACK_EN,

				    0x04, 0x00);

		wcd_cls_h_fsm(codec, &wcd937x->clsh_info,

			     WCD_CLSH_EVENT_PRE_DAC,

			     WCD_CLSH_STATE_EAR,
@@ -874,6 +876,8 @@ static int wcd937x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
			     WCD_CLSH_EVENT_POST_PA,

			     WCD_CLSH_STATE_EAR,

			     hph_mode);

		snd_soc_update_bits(codec, WCD937X_FLYBACK_EN,

				    0x04, 0x04);

		break;

	};

	return ret;

include/asoc/wcd9xxx_registers.h

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

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -20,6 +20,7 @@ 
#define WCD9XXX_ANA_HPH                             (WCD9XXX_BASE_ADDRESS+0x009)

#define WCD9XXX_CLASSH_MODE_2                       (WCD9XXX_BASE_ADDRESS+0x098)

#define WCD9XXX_CLASSH_MODE_3                       (WCD9XXX_BASE_ADDRESS+0x099)

#define WCD9XXX_FLYBACK_VNEG_CTRL_1                 (WCD9XXX_BASE_ADDRESS+0x0A5)

#define WCD9XXX_FLYBACK_VNEG_CTRL_4                 (WCD9XXX_BASE_ADDRESS+0x0A8)

#define WCD9XXX_FLYBACK_VNEGDAC_CTRL_2              (WCD9XXX_BASE_ADDRESS+0x0AF)

#define WCD9XXX_RX_BIAS_HPH_LOWPOWER                (WCD9XXX_BASE_ADDRESS+0x0BF)