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

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

Merge "ASoC: wcd9330: Adjust HPH bias current to 3.5uA"

parents 16b4649c c11f1988

sound/soc/codecs/wcd9330.c

+1 −1
Original line number Diff line number Diff line
@@ -7343,7 +7343,7 @@ static const struct wcd9xxx_reg_mask_val tomtom_reg_defaults[] = { 
	TOMTOM_REG_VAL(TOMTOM_A_CDC_MAD_INP_SEL, 0x01),



	/* Set HPH Path to low power mode */

	TOMTOM_REG_VAL(TOMTOM_A_RX_HPH_BIAS_PA, 0x55),

	TOMTOM_REG_VAL(TOMTOM_A_RX_HPH_BIAS_PA, 0x57),



	/* BUCK default */

	TOMTOM_REG_VAL(TOMTOM_A_BUCK_CTRL_CCL_4, 0x51),

sound/soc/codecs/wcd9xxx-common.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, 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
@@ -579,7 +579,7 @@ void wcd9xxx_enable_high_perf_mode(struct snd_soc_codec *codec, 
					WCD9XXX_A_RX_HPH_L_PA_CTL__POR);

		snd_soc_write(codec, WCD9XXX_A_RX_HPH_R_PA_CTL,

					WCD9XXX_A_RX_HPH_R_PA_CTL__POR);

		snd_soc_write(codec, WCD9XXX_A_RX_HPH_BIAS_PA, 0x55);

		snd_soc_write(codec, WCD9XXX_A_RX_HPH_BIAS_PA, 0x57);

		wcd9xxx_enable_buck(codec, clsh_d, true);

		wcd9xxx_chargepump_request(codec, false);

		wcd9xxx_enable_anc_delay(codec, false);