aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/omap/omap-dmic.c2
-rw-r--r--sound/soc/omap/omap-mcbsp.c3
-rw-r--r--sound/soc/omap/omap-mcpdm.c3
3 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 60b7b8cd1c7d..df0ff247f496 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -33,7 +33,6 @@
33#include <linux/slab.h> 33#include <linux/slab.h>
34#include <linux/pm_runtime.h> 34#include <linux/pm_runtime.h>
35#include <linux/of_device.h> 35#include <linux/of_device.h>
36#include <plat/dma.h>
37 36
38#include <sound/core.h> 37#include <sound/core.h>
39#include <sound/pcm.h> 38#include <sound/pcm.h>
@@ -63,7 +62,6 @@ struct omap_dmic {
63 */ 62 */
64static struct omap_pcm_dma_data omap_dmic_dai_dma_params = { 63static struct omap_pcm_dma_data omap_dmic_dai_dma_params = {
65 .name = "DMIC capture", 64 .name = "DMIC capture",
66 .data_type = OMAP_DMA_DATA_TYPE_S32,
67}; 65};
68 66
69static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) 67static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 5b3baccd74c3..a23064644e58 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -34,7 +34,6 @@
34#include <sound/initval.h> 34#include <sound/initval.h>
35#include <sound/soc.h> 35#include <sound/soc.h>
36 36
37#include <plat/dma.h>
38#include <plat/mcbsp.h> 37#include <plat/mcbsp.h>
39#include "mcbsp.h" 38#include "mcbsp.h"
40#include "omap-mcbsp.h" 39#include "omap-mcbsp.h"
@@ -234,11 +233,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
234 233
235 switch (params_format(params)) { 234 switch (params_format(params)) {
236 case SNDRV_PCM_FORMAT_S16_LE: 235 case SNDRV_PCM_FORMAT_S16_LE:
237 dma_data->data_type = OMAP_DMA_DATA_TYPE_S16;
238 wlen = 16; 236 wlen = 16;
239 break; 237 break;
240 case SNDRV_PCM_FORMAT_S32_LE: 238 case SNDRV_PCM_FORMAT_S32_LE:
241 dma_data->data_type = OMAP_DMA_DATA_TYPE_S32;
242 wlen = 32; 239 wlen = 32;
243 break; 240 break;
244 default: 241 default:
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index f90d5de605c3..84743d47e687 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,7 +40,6 @@
40#include <sound/pcm_params.h> 40#include <sound/pcm_params.h>
41#include <sound/soc.h> 41#include <sound/soc.h>
42 42
43#include <plat/dma.h>
44#include <plat/omap_hwmod.h> 43#include <plat/omap_hwmod.h>
45#include "omap-mcpdm.h" 44#include "omap-mcpdm.h"
46#include "omap-pcm.h" 45#include "omap-pcm.h"
@@ -71,11 +70,9 @@ struct omap_mcpdm {
71static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = { 70static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = {
72 { 71 {
73 .name = "Audio playback", 72 .name = "Audio playback",
74 .data_type = OMAP_DMA_DATA_TYPE_S32,
75 }, 73 },
76 { 74 {
77 .name = "Audio capture", 75 .name = "Audio capture",
78 .data_type = OMAP_DMA_DATA_TYPE_S32,
79 }, 76 },
80}; 77};
81 78