ASoC: wm_adsp: Ensure DSP controls are always persistent
Subsystems (3)
PATCH 1/2 ASoC: wm_adsp: Ensure DSP controls are always persistent
From: Nikesh Oswal <[email protected]>
Currently DSP controls are persistent (across DSP On/Off) only if they were set whilst the DSP is off. This change makes the controls persistent irrespective of when they are set.
--- sound/soc/codecs/wm_adsp.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +2 -3
@@ -420,10 +420,9 @@ static int wm_coeff_put(struct snd_kcontrol *kcontrol,memcpy (ctl->cache, p, ctl->len); -if (!ctl->enabled) { - ctl->set =1 ; + ctl->set =1 ; +if (!ctl->enabled)return 0 ; - }return wm_coeff_write_control (kcontrol, p, ctl->len); }
Signature · 1 line
1.7.2.5
PATCH 2/2 ASoC: wm_adsp: Improve round to next 4-byte boundary
Whilst the existing code does correctly round to the next 4-byte boundary it does so rather inefficiently. This patch changes the rounding to be simpler and more efficient.
--- sound/soc/codecs/wm_adsp.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)
sound/soc/codecs/wm_adsp.c +1 -7
@@ -1184,7 +1184,6 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)int ret, pos, blocks, type, offset, reg;char *file;struct wm_adsp_buf *buf; -int tmp; file =kzalloc (PAGE_SIZE ,GFP_KERNEL );if (file ==NULL )
@@ -1334,12 +1333,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) } } - tmp =le32_to_cpu (blk->len) %4 ; -if (tmp) - pos +=le32_to_cpu (blk->len) + (4 - tmp) +sizeof (*blk); -else - pos +=le32_to_cpu (blk->len) +sizeof (*blk); - + pos += (le32_to_cpu (blk->len) +sizeof (*blk) +3 ) & ~0x03 ; blocks++; }
Signature · 1 line
1.7.2.5
Quoted 5 lines · Charles Keepax
From: Nikesh Oswal <[email protected]>
Currently DSP controls are persistent (across DSP On/Off) only if they were set whilst the DSP is off. This change makes the controls persistent irrespective of when they are set.
Applied both, thanks.