aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/mcbsp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 5f6c21d4b59..d7167932113 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -173,6 +173,9 @@ void omap_mcbsp_config(struct omap_mcbsp *mcbsp,
173 MCBSP_WRITE(mcbsp, XCCR, config->xccr); 173 MCBSP_WRITE(mcbsp, XCCR, config->xccr);
174 MCBSP_WRITE(mcbsp, RCCR, config->rccr); 174 MCBSP_WRITE(mcbsp, RCCR, config->rccr);
175 } 175 }
176 /* Enable wakeup behavior */
177 if (mcbsp->pdata->has_wakeup)
178 MCBSP_WRITE(mcbsp, WAKEUPEN, XRDYEN | RRDYEN);
176} 179}
177 180
178/** 181/**
@@ -479,10 +482,6 @@ int omap_mcbsp_request(struct omap_mcbsp *mcbsp)
479 if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request) 482 if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
480 mcbsp->pdata->ops->request(mcbsp->id - 1); 483 mcbsp->pdata->ops->request(mcbsp->id - 1);
481 484
482 /* Enable wakeup behavior */
483 if (mcbsp->pdata->has_wakeup)
484 MCBSP_WRITE(mcbsp, WAKEUPEN, XRDYEN | RRDYEN);
485
486 /* 485 /*
487 * Make sure that transmitter, receiver and sample-rate generator are 486 * Make sure that transmitter, receiver and sample-rate generator are
488 * not running before activating IRQs. 487 * not running before activating IRQs.