aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/omap/mcbsp.c2
-rw-r--r--sound/soc/omap/mcbsp.h1
-rw-r--r--sound/soc/omap/omap-mcbsp.c1
3 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index e5f44440d1b9..ec6832cc296d 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -754,7 +754,7 @@ THRESHOLD_PROP_BUILDER(max_tx_thres);
754THRESHOLD_PROP_BUILDER(max_rx_thres); 754THRESHOLD_PROP_BUILDER(max_rx_thres);
755 755
756static const char *dma_op_modes[] = { 756static const char *dma_op_modes[] = {
757 "element", "threshold", "frame", 757 "element", "threshold",
758}; 758};
759 759
760static ssize_t dma_op_mode_show(struct device *dev, 760static ssize_t dma_op_mode_show(struct device *dev,
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index a944fcc9073c..179a822c7238 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -217,7 +217,6 @@ enum {
217/********************** McBSP DMA operating modes **************************/ 217/********************** McBSP DMA operating modes **************************/
218#define MCBSP_DMA_MODE_ELEMENT 0 218#define MCBSP_DMA_MODE_ELEMENT 0
219#define MCBSP_DMA_MODE_THRESHOLD 1 219#define MCBSP_DMA_MODE_THRESHOLD 1
220#define MCBSP_DMA_MODE_FRAME 2
221 220
222/********************** McBSP WAKEUPEN bit definitions *********************/ 221/********************** McBSP WAKEUPEN bit definitions *********************/
223#define RSYNCERREN BIT(0) 222#define RSYNCERREN BIT(0)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 418dc3cebdec..27144a67e5ec 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -245,7 +245,6 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
245 } 245 }
246 if (mcbsp->pdata->buffer_size) { 246 if (mcbsp->pdata->buffer_size) {
247 dma_data->set_threshold = omap_mcbsp_set_threshold; 247 dma_data->set_threshold = omap_mcbsp_set_threshold;
248 /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
249 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { 248 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
250 int period_words, max_thrsh; 249 int period_words, max_thrsh;
251 250