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

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

ASoC: Trigger wm_hubs series update startup off a separate flag 



Allowing the two to be used independently.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent ec3ea54c

sound/soc/codecs/wm8993.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1434,6 +1434,7 @@ static int wm8993_probe(struct snd_soc_codec *codec) 




	wm8993->hubs_data.hp_startup_mode = 1;

	wm8993->hubs_data.hp_startup_mode = 1;

	wm8993->hubs_data.dcs_codes = -2;

	wm8993->hubs_data.dcs_codes = -2;

	wm8993->hubs_data.series_startup = 1;





	ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);

	ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);

	if (ret != 0) {

	if (ret != 0) {

sound/soc/codecs/wm8994.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2903,6 +2903,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
			wm8994->hubs.dcs_codes = -5;

			wm8994->hubs.dcs_codes = -5;

			wm8994->hubs.hp_startup_mode = 1;

			wm8994->hubs.hp_startup_mode = 1;

			wm8994->hubs.dcs_readback_mode = 1;

			wm8994->hubs.dcs_readback_mode = 1;

			wm8994->hubs.series_startup = 1;

			break;

			break;

		default:

		default:

			wm8994->hubs.dcs_readback_mode = 1;

			wm8994->hubs.dcs_readback_mode = 1;

sound/soc/codecs/wm_hubs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -107,8 +107,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) 
		return;

		return;

	}

	}





	/* Devices not using a DCS code correction have startup mode */

	if (hubs->series_startup) {

	if (hubs->dcs_codes) {

		/* Set for 32 series updates */

		/* Set for 32 series updates */

		snd_soc_update_bits(codec, WM8993_DC_SERVO_1,

		snd_soc_update_bits(codec, WM8993_DC_SERVO_1,

				    WM8993_DCS_SERIES_NO_01_MASK,

				    WM8993_DCS_SERIES_NO_01_MASK,

sound/soc/codecs/wm_hubs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ struct wm_hubs_data { 
	int dcs_codes;

	int dcs_codes;

	int dcs_readback_mode;

	int dcs_readback_mode;

	int hp_startup_mode;

	int hp_startup_mode;

	int series_startup;





	bool class_w;

	bool class_w;

	u16 class_w_dcs;

	u16 class_w_dcs;