projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'asoc-fix-v5.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
sound
/
soc
/
codecs
/
wm_adsp.c
diff --git
a/sound/soc/codecs/wm_adsp.c
b/sound/soc/codecs/wm_adsp.c
index
37aa020
..
fe15cbc
100644
(file)
--- a/
sound/soc/codecs/wm_adsp.c
+++ b/
sound/soc/codecs/wm_adsp.c
@@
-282,6
+282,7
@@
/*
* HALO_CCM_CORE_CONTROL
*/
/*
* HALO_CCM_CORE_CONTROL
*/
+#define HALO_CORE_RESET 0x00000200
#define HALO_CORE_EN 0x00000001
/*
#define HALO_CORE_EN 0x00000001
/*
@@
-746,7
+747,6
@@
static void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)
{
wm_adsp_debugfs_clear(dsp);
static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)
{
wm_adsp_debugfs_clear(dsp);
- debugfs_remove_recursive(dsp->debugfs_root);
}
#else
static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
}
#else
static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
@@
-1213,7
+1213,7
@@
static int wm_coeff_tlv_get(struct snd_kcontrol *kctl,
mutex_lock(&ctl->dsp->pwr_lock);
mutex_lock(&ctl->dsp->pwr_lock);
- ret = wm_coeff_read_ctrl
_raw
(ctl, ctl->cache, size);
+ ret = wm_coeff_read_ctrl(ctl, ctl->cache, size);
if (!ret && copy_to_user(bytes, ctl->cache, size))
ret = -EFAULT;
if (!ret && copy_to_user(bytes, ctl->cache, size))
ret = -EFAULT;
@@
-3333,7
+3333,8
@@
static int wm_halo_start_core(struct wm_adsp *dsp)
{
return regmap_update_bits(dsp->regmap,
dsp->base + HALO_CCM_CORE_CONTROL,
{
return regmap_update_bits(dsp->regmap,
dsp->base + HALO_CCM_CORE_CONTROL,
- HALO_CORE_EN, HALO_CORE_EN);
+ HALO_CORE_RESET | HALO_CORE_EN,
+ HALO_CORE_RESET | HALO_CORE_EN);
}
static void wm_halo_stop_core(struct wm_adsp *dsp)
}
static void wm_halo_stop_core(struct wm_adsp *dsp)