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

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

Merge "ASoC: wsa881x: Update codec configuration settings"

parents 3d1d43df d6c63651
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -893,9 +893,12 @@ static void wsa881x_init(struct snd_soc_codec *codec)
	snd_soc_update_bits(codec, WSA881X_CDC_RST_CTL, 0x01, 0x01);

	if (WSA881X_IS_2_0(wsa881x->version)) {
		snd_soc_update_bits(codec, WSA881X_CLOCK_CONFIG, 0x10, 0x10);
		snd_soc_update_bits(codec, WSA881X_SPKR_OCP_CTL, 0x02, 0x02);
		snd_soc_update_bits(codec, WSA881X_SPKR_MISC_CTL1, 0xC0, 0x80);
		snd_soc_update_bits(codec, WSA881X_SPKR_MISC_CTL1, 0x06, 0x06);
		snd_soc_update_bits(codec, WSA881X_SPKR_PA_INT, 0xF0, 0x20);
		snd_soc_update_bits(codec, WSA881X_SPKR_BIAS_INT, 0xFF, 0x00);
		snd_soc_update_bits(codec, WSA881X_SPKR_PA_INT, 0xF0, 0x40);
		snd_soc_update_bits(codec, WSA881X_SPKR_PA_INT, 0x0E, 0x0E);
		snd_soc_update_bits(codec, WSA881X_BOOST_LOOP_STABILITY,
				    0x03, 0x03);
@@ -906,8 +909,11 @@ static void wsa881x_init(struct snd_soc_codec *codec)
				    0x0C, 0x04);
		snd_soc_update_bits(codec, WSA881X_BOOST_SLOPE_COMP_ISENSE_FB,
				    0x03, 0x00);
		snd_soc_update_bits(codec, WSA881X_BOOST_PRESET_OUT1,
				    0xF0, 0x70);
		snd_soc_update_bits(codec, WSA881X_BOOST_PRESET_OUT2,
				    0xF0, 0x30);
		snd_soc_update_bits(codec, WSA881X_SPKR_DRV_EN, 0x08, 0x08);
		snd_soc_update_bits(codec, WSA881X_BOOST_PS_CTL, 0x80, 0x00);
		snd_soc_update_bits(codec, WSA881X_BOOST_CURRENT_LIMIT,
				    0x0F, 0x08);
		snd_soc_update_bits(codec, WSA881X_SPKR_OCP_CTL, 0x30, 0x30);