Skip to contentSkip to conversation

ASoC: wm_adsp: Remove duplicate info message for DSP RAM ready

PATCH Applied Charles Keepax 2 participants 3 messages Dec 18, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: wm_adsp: Remove duplicate info message for DSP RAM ready

---
 sound/soc/codecs/wm_adsp.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/codecs/wm_adsp.c +0 -1
index de47ad7..456784f 100644
@@ -1489,7 +1489,6 @@ static int wm_adsp2_ena(struct wm_adsp *dsp)
 	}
 
 	adsp_dbg(dsp, "RAM ready after %d polls\n", count);
-	adsp_info(dsp, "RAM ready after %d polls\n", count);
 
 	return 0;
 }
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 2/2 ASoC: wm_adsp: Add small delay whilst polling DSP RAM start

Some devices are getting very close to the limit whilst polling the RAM start, this patch adds a small delay to this loop to give a longer startup timeout.

---
 sound/soc/codecs/wm_adsp.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +7 -3
index 456784f..fb0c678 100644
@@ -1475,13 +1475,17 @@ static int wm_adsp2_ena(struct wm_adsp *dsp)
 		return ret;
 
 	/* Wait for the RAM to start, should be near instantaneous */
-	count = 0;
-	do {
+	for (count = 0; count < 10; ++count) {
 		ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1,
 				  &val);
 		if (ret != 0)
 			return ret;
-	} while (!(val & ADSP2_RAM_RDY) && ++count < 10);
+
+		if (val & ADSP2_RAM_RDY)
+			break;
+
+		msleep(1);
+	}
 
 	if (!(val & ADSP2_RAM_RDY)) {
 		adsp_err(dsp, "Failed to start DSP RAM\n");
Signature · 1 line
1.7.2.5