@@ -115,6 +115,12 @@ struct wm_adsp {
115115#endif
116116};
117117
118+ #define WM_ADSP_PRELOADER (wname , num , event_fn ) \
119+ { .id = snd_soc_dapm_supply, .name = wname " Preloader", \
120+ .reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \
121+ .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
122+ .subseq = 100, /* Ensure we run after SYSCLK supply widget */ }
123+
118124#define WM_ADSP1 (wname , num ) \
119125 SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \
120126 wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)
@@ -125,20 +131,14 @@ struct wm_adsp {
125131
126132#define WM_ADSP2 (wname , num , event_fn ) \
127133 SND_SOC_DAPM_SPK(wname " Preload", NULL), \
128- { .id = snd_soc_dapm_supply, .name = wname " Preloader", \
129- .reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \
130- .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
131- .subseq = 100, /* Ensure we run after SYSCLK supply widget */ }, \
134+ WM_ADSP_PRELOADER(wname, num, event_fn), \
132135{ .id = snd_soc_dapm_out_drv, .name = wname, \
133136 .reg = SND_SOC_NOPM, .shift = num, .event = wm_adsp2_event, \
134137 .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
135138
136139#define WM_HALO (wname , num , event_fn ) \
137140 SND_SOC_DAPM_SPK(wname " Preload", NULL), \
138- { .id = snd_soc_dapm_supply, .name = wname " Preloader", \
139- .reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \
140- .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
141- .subseq = 100, /* Ensure we run after SYSCLK supply widget */ }, \
141+ WM_ADSP_PRELOADER(wname, num, event_fn), \
142142{ .id = snd_soc_dapm_out_drv, .name = wname, \
143143 .reg = SND_SOC_NOPM, .shift = num, .event = wm_halo_event, \
144144 .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
0 commit comments