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

Commit db924ff5 authored by Mark Brown's avatar Mark Brown
Browse files

extcon: arizona: Don't ground flip when using HPDET identification 



This extra check makes the procedure take longer and is of marginal use
in identification so do not execute it.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9dd5e53d

drivers/extcon/extcon-arizona.c

+1 −23
Original line number Diff line number Diff line
@@ -470,29 +470,7 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading) 
	 */

	if (arizona->pdata.hpdet_acc_id) {

		info->hpdet_res[info->num_hpdet_res++] = *reading;



		/*

		 * If the impedence is too high don't measure the

		 * second ground.

		 */

		if (info->num_hpdet_res == 1 && *reading >= 45) {

			dev_dbg(arizona->dev, "Skipping ground flip\n");

		info->hpdet_res[info->num_hpdet_res++] = *reading;

		}



		if (info->num_hpdet_res == 1) {

			dev_dbg(arizona->dev, "Flipping ground\n");



			regmap_update_bits(arizona->regmap,

					   ARIZONA_ACCESSORY_DETECT_MODE_1,

					   ARIZONA_ACCDET_SRC,

					   ~info->micd_modes[0].src);



			regmap_update_bits(arizona->regmap,

					   ARIZONA_HEADPHONE_DETECT_1,

					   ARIZONA_HP_POLL, ARIZONA_HP_POLL);

			return -EAGAIN;

		}



		/* Only check the mic directly if we didn't already ID it */

		if (id_gpio && info->num_hpdet_res == 2 &&