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

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

Merge "ASoC: msm8x16-wcd: Config HPH PA gain for high impedance headset"

parents f9abb49d 9558dd82

sound/soc/codecs/msm8x16-wcd.c

+2 −7
Original line number Diff line number Diff line
@@ -4078,11 +4078,6 @@ void wcd_imped_config(struct snd_soc_codec *codec, 
			 __func__);

		return;

	}

	if (value >= wcd_imped_val[ARRAY_SIZE(wcd_imped_val) - 1]) {

		pr_err("%s, invalid imped, greater than 48 Ohm\n = %d\n",

			__func__, value);

		return;

	}



	codec_version = get_codec_version(msm8x16_wcd);
@@ -4093,9 +4088,9 @@ void wcd_imped_config(struct snd_soc_codec *codec, 
		case CONGA:

			/*

			 * For 32Ohm load and higher loads, Set 0x19E

			 * bit 5 to 1 (POS_6_DB_DI). For loads lower

			 * bit 5 to 1 (POS_0_DB_DI). For loads lower

			 * than 32Ohm (such as 16Ohm load), Set 0x19E

			 * bit 5 to 0 (POS_1P5_DB_DI)

			 * bit 5 to 0 (POS_M4P5_DB_DI)

			 */

			if (value >= 32)

				snd_soc_update_bits(codec,