|
@@ -1468,8 +1468,8 @@ static int wm_adsp2_ena(struct wm_adsp *dsp)
|
|
|
unsigned int val;
|
|
unsigned int val;
|
|
|
int ret, count;
|
|
int ret, count;
|
|
|
|
|
|
|
|
- ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
|
|
|
|
|
- ADSP2_SYS_ENA, ADSP2_SYS_ENA);
|
|
|
|
|
|
|
+ ret = regmap_update_bits_async(dsp->regmap, dsp->base + ADSP2_CONTROL,
|
|
|
|
|
+ ADSP2_SYS_ENA, ADSP2_SYS_ENA);
|
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
|
@@ -1521,9 +1521,9 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
|
|
|
val = (val & ARIZONA_SYSCLK_FREQ_MASK)
|
|
val = (val & ARIZONA_SYSCLK_FREQ_MASK)
|
|
|
>> ARIZONA_SYSCLK_FREQ_SHIFT;
|
|
>> ARIZONA_SYSCLK_FREQ_SHIFT;
|
|
|
|
|
|
|
|
- ret = regmap_update_bits(dsp->regmap,
|
|
|
|
|
- dsp->base + ADSP2_CLOCKING,
|
|
|
|
|
- ADSP2_CLK_SEL_MASK, val);
|
|
|
|
|
|
|
+ ret = regmap_update_bits_async(dsp->regmap,
|
|
|
|
|
+ dsp->base + ADSP2_CLOCKING,
|
|
|
|
|
+ ADSP2_CLK_SEL_MASK, val);
|
|
|
if (ret != 0) {
|
|
if (ret != 0) {
|
|
|
adsp_err(dsp, "Failed to set clock rate: %d\n",
|
|
adsp_err(dsp, "Failed to set clock rate: %d\n",
|
|
|
ret);
|
|
ret);
|
|
@@ -1586,10 +1586,10 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
|
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
|
goto err;
|
|
goto err;
|
|
|
|
|
|
|
|
- ret = regmap_update_bits(dsp->regmap,
|
|
|
|
|
- dsp->base + ADSP2_CONTROL,
|
|
|
|
|
- ADSP2_CORE_ENA | ADSP2_START,
|
|
|
|
|
- ADSP2_CORE_ENA | ADSP2_START);
|
|
|
|
|
|
|
+ ret = regmap_update_bits_async(dsp->regmap,
|
|
|
|
|
+ dsp->base + ADSP2_CONTROL,
|
|
|
|
|
+ ADSP2_CORE_ENA | ADSP2_START,
|
|
|
|
|
+ ADSP2_CORE_ENA | ADSP2_START);
|
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
|
goto err;
|
|
goto err;
|
|
|
|
|
|