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

Commit 12db5edd authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Start DSP booting earlier in the DAPM process 



Move the start of booting the DSP to earlier in the DAPM process, and
move the final starting of the DSP to later in the DAPM process. This
allows us to overlap some of the processing with other components of the
system being brought up.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d8a64d6a

sound/soc/codecs/arizona.h

+9 −8
Original line number Diff line number Diff line
@@ -166,20 +166,21 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 
	ARIZONA_MIXER_INPUT_ROUTES(name " Input 4")



#define ARIZONA_DSP_ROUTES(name) \

	{ name, NULL, name " Aux 1" }, \

	{ name, NULL, name " Aux 2" }, \

	{ name, NULL, name " Aux 3" }, \

	{ name, NULL, name " Aux 4" }, \

	{ name, NULL, name " Aux 5" }, \

	{ name, NULL, name " Aux 6" }, \

	{ name, NULL, name " Preloader"}, \

	{ name " Preloader", NULL, name " Aux 1" }, \

	{ name " Preloader", NULL, name " Aux 2" }, \

	{ name " Preloader", NULL, name " Aux 3" }, \

	{ name " Preloader", NULL, name " Aux 4" }, \

	{ name " Preloader", NULL, name " Aux 5" }, \

	{ name " Preloader", NULL, name " Aux 6" }, \

	ARIZONA_MIXER_INPUT_ROUTES(name " Aux 1"), \

	ARIZONA_MIXER_INPUT_ROUTES(name " Aux 2"), \

	ARIZONA_MIXER_INPUT_ROUTES(name " Aux 3"), \

	ARIZONA_MIXER_INPUT_ROUTES(name " Aux 4"), \

	ARIZONA_MIXER_INPUT_ROUTES(name " Aux 5"), \

	ARIZONA_MIXER_INPUT_ROUTES(name " Aux 6"), \

	ARIZONA_MIXER_ROUTES(name, name "L"), \

	ARIZONA_MIXER_ROUTES(name, name "R")

	ARIZONA_MIXER_ROUTES(name " Preloader", name "L"), \

	ARIZONA_MIXER_ROUTES(name " Preloader", name "R")



#define ARIZONA_RATE_ENUM_SIZE 4

extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE];

sound/soc/codecs/wm_adsp.c

+21 −3
Original line number Diff line number Diff line
@@ -1591,6 +1591,27 @@ void wm_adsp2_boot_work(struct work_struct *work) 
			   ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);

}



int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);

	struct wm_adsp *dsp = &dsps[w->shift];



	dsp->card = codec->card;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		queue_work(system_unbound_wq, &dsp->boot_work);

		break;

	default:

		break;

	};



	return 0;

}

EXPORT_SYMBOL_GPL(wm_adsp2_early_event);



int wm_adsp2_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event)

{
@@ -1601,11 +1622,8 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 
	struct wm_coeff_ctl *ctl;

	int ret;



	dsp->card = codec->card;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		queue_work(system_unbound_wq, &dsp->boot_work);

		flush_work(&dsp->boot_work);



		if (!dsp->running)

sound/soc/codecs/wm_adsp.h

+8 −2
Original line number Diff line number Diff line
@@ -68,8 +68,12 @@ struct wm_adsp { 
		wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)



#define WM_ADSP2(wname, num) \

	SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \

		wm_adsp2_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)

{	.id = snd_soc_dapm_dai_link, .name = wname " Preloader", \

	.reg = SND_SOC_NOPM, .shift = num, .event = wm_adsp2_early_event, \

	.event_flags = SND_SOC_DAPM_PRE_PMU }, \

{	.id = snd_soc_dapm_out_drv, .name = wname, \

	.reg = SND_SOC_NOPM, .shift = num, .event = wm_adsp2_event, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }



extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];

extern const struct snd_kcontrol_new wm_adsp2_fw_controls[];
@@ -78,6 +82,8 @@ int wm_adsp1_init(struct wm_adsp *adsp); 
int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs);

int wm_adsp1_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event);

int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,

			 struct snd_kcontrol *kcontrol, int event);

int wm_adsp2_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event);