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

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

Merge "ASoC: wcd9xxx: Make vddio usage configurable"

parents b003afb8 7ced75d4

sound/soc/codecs/wcd9xxx-mbhc.c

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ module_param(impedance_detect_en, int, 
			S_IRUGO | S_IWUSR | S_IWGRP);

MODULE_PARM_DESC(impedance_detect_en, "enable/disable impedance detect");



static bool detect_use_vddio_switch = true;

static bool detect_use_vddio_switch;



struct wcd9xxx_mbhc_detect {

	u16 dce;
@@ -1767,6 +1767,7 @@ wcd9xxx_codec_get_plug_type(struct wcd9xxx_mbhc *mbhc, bool highhph) 


	/* GND and MIC swap detection requires at least 2 rounds of DCE */

	BUG_ON(NUM_DCE_PLUG_INS_DETECT < 2);

	detect_use_vddio_switch = mbhc->mbhc_cfg->use_vddio_meas;



	/*

	 * There are chances vddio switch is on and cfilt voltage is adjusted

sound/soc/codecs/wcd9xxx-mbhc.h

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ struct wcd9xxx_mbhc_config { 
	unsigned long cs_enable_flags;

	bool use_int_rbias;

	bool do_recalibration;

	bool use_vddio_meas;

};



struct wcd9xxx_cfilt_mode {

sound/soc/msm/msm8226.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 
			    1 << MBHC_CS_ENABLE_INSERTION |

			    1 << MBHC_CS_ENABLE_REMOVAL),

	.do_recalibration = true,

	.use_vddio_meas = true,

};



struct msm_auxpcm_gpio {

sound/soc/msm/msm8974.c

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 
			    1 << MBHC_CS_ENABLE_INSERTION |

			    1 << MBHC_CS_ENABLE_REMOVAL),

	.do_recalibration = true,

	.use_vddio_meas = true,

};



struct msm_auxpcm_gpio {

sound/soc/msm/msm8x10.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 
			    1 << MBHC_CS_ENABLE_INSERTION |

			    1 << MBHC_CS_ENABLE_REMOVAL),

	.do_recalibration = false,

	.use_vddio_meas = false,

};



/*