hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp 

Conflicts:
	sound/soc/codecs/wm_adsp.c
This commit is contained in:
Mark Brown 2013-01-29 00:51:05 +08:00
parent 7480800ea6 2d30b5751d
commit 06dc374c70
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/codecs/wm_adsp.c
View File

@ -110,9 +110,12 @@
#define ADSP1_CLK_SEL_SHIFT 0 /* CLK_SEL_ENA */ #define ADSP1_CLK_SEL_SHIFT 0 /* CLK_SEL_ENA */
#define ADSP1_CLK_SEL_WIDTH 3 /* CLK_SEL_ENA */ #define ADSP1_CLK_SEL_WIDTH 3 /* CLK_SEL_ENA */
#define ADSP2_CONTROL 0 #define ADSP2_CONTROL 0x0
#define ADSP2_CLOCKING 1 #define ADSP2_CLOCKING 0x1
#define ADSP2_STATUS1 4 #define ADSP2_STATUS1 0x4
#define ADSP2_WDMA_CONFIG_1 0x30
#define ADSP2_WDMA_CONFIG_2 0x31
#define ADSP2_RDMA_CONFIG_1 0x34
/* /*
* ADSP2 Control * ADSP2 Control
@ -688,7 +691,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
hdr = (void*)&firmware->data[0]; hdr = (void*)&firmware->data[0];
if (memcmp(hdr->magic, "WMDR", 4) != 0) { if (memcmp(hdr->magic, "WMDR", 4) != 0) {
adsp_err(dsp, "%s: invalid magic\n", file); adsp_err(dsp, "%s: invalid magic\n", file);
return -EINVAL; goto out_fw;
} }
switch (be32_to_cpu(hdr->rev) & 0xff) { switch (be32_to_cpu(hdr->rev) & 0xff) {
@ -1027,6 +1030,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_SYS_ENA | ADSP2_CORE_ENA |
ADSP2_START, 0); ADSP2_START, 0);
/* Make sure DMAs are quiesced */
regmap_write(dsp->regmap, dsp->base + ADSP2_WDMA_CONFIG_1, 0);
regmap_write(dsp->regmap, dsp->base + ADSP2_WDMA_CONFIG_2, 0);
regmap_write(dsp->regmap, dsp->base + ADSP2_RDMA_CONFIG_1, 0);
if (dsp->dvfs) { if (dsp->dvfs) {
ret = regulator_set_voltage(dsp->dvfs, 1200000, ret = regulator_set_voltage(dsp->dvfs, 1200000,
1800000); 1800000);