Commit 45b4acab authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown

ASoC: wm_adsp: Add control_add callback and export wm_adsp_control_add()

The callback allows codec drivers to affect how firmware coefficients
are added as controls.

For example a codec driver may selectively add controls by choosing to
call wm_adsp_control_add() based on some filter logic.
Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20240805102721.30102-2-simont@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 93afd028
...@@ -583,7 +583,7 @@ static void wm_adsp_ctl_work(struct work_struct *work) ...@@ -583,7 +583,7 @@ static void wm_adsp_ctl_work(struct work_struct *work)
kfree(kcontrol); kfree(kcontrol);
} }
static int wm_adsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl) int wm_adsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl)
{ {
struct wm_adsp *dsp = container_of(cs_ctl->dsp, struct wm_adsp, cs_dsp); struct wm_adsp *dsp = container_of(cs_ctl->dsp, struct wm_adsp, cs_dsp);
struct cs_dsp *cs_dsp = &dsp->cs_dsp; struct cs_dsp *cs_dsp = &dsp->cs_dsp;
...@@ -658,6 +658,17 @@ static int wm_adsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl) ...@@ -658,6 +658,17 @@ static int wm_adsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(wm_adsp_control_add);
static int wm_adsp_control_add_cb(struct cs_dsp_coeff_ctl *cs_ctl)
{
struct wm_adsp *dsp = container_of(cs_ctl->dsp, struct wm_adsp, cs_dsp);
if (dsp->control_add)
return (dsp->control_add)(dsp, cs_ctl);
else
return wm_adsp_control_add(cs_ctl);
}
static void wm_adsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl) static void wm_adsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl)
{ {
...@@ -2072,12 +2083,12 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data) ...@@ -2072,12 +2083,12 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data)
EXPORT_SYMBOL_GPL(wm_halo_wdt_expire); EXPORT_SYMBOL_GPL(wm_halo_wdt_expire);
static const struct cs_dsp_client_ops wm_adsp1_client_ops = { static const struct cs_dsp_client_ops wm_adsp1_client_ops = {
.control_add = wm_adsp_control_add, .control_add = wm_adsp_control_add_cb,
.control_remove = wm_adsp_control_remove, .control_remove = wm_adsp_control_remove,
}; };
static const struct cs_dsp_client_ops wm_adsp2_client_ops = { static const struct cs_dsp_client_ops wm_adsp2_client_ops = {
.control_add = wm_adsp_control_add, .control_add = wm_adsp_control_add_cb,
.control_remove = wm_adsp_control_remove, .control_remove = wm_adsp_control_remove,
.pre_run = wm_adsp_pre_run, .pre_run = wm_adsp_pre_run,
.post_run = wm_adsp_event_post_run, .post_run = wm_adsp_event_post_run,
......
...@@ -37,6 +37,7 @@ struct wm_adsp { ...@@ -37,6 +37,7 @@ struct wm_adsp {
bool wmfw_optional; bool wmfw_optional;
struct work_struct boot_work; struct work_struct boot_work;
int (*control_add)(struct wm_adsp *dsp, struct cs_dsp_coeff_ctl *cs_ctl);
int (*pre_run)(struct wm_adsp *dsp); int (*pre_run)(struct wm_adsp *dsp);
bool preloaded; bool preloaded;
...@@ -132,6 +133,8 @@ int wm_adsp_compr_pointer(struct snd_soc_component *component, ...@@ -132,6 +133,8 @@ int wm_adsp_compr_pointer(struct snd_soc_component *component,
int wm_adsp_compr_copy(struct snd_soc_component *component, int wm_adsp_compr_copy(struct snd_soc_component *component,
struct snd_compr_stream *stream, struct snd_compr_stream *stream,
char __user *buf, size_t count); char __user *buf, size_t count);
int wm_adsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl);
int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type,
unsigned int alg, void *buf, size_t len); unsigned int alg, void *buf, size_t len);
int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type, int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment