summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 16:22:07 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 16:22:07 +0100
commit1bd202e4c7745459aca6616cd127b2d2bbd29901 (patch)
tree94ab16eaf7ee76c4d495780df8d72c8e765a61cd /include
parentMerge remote-tracking branch 'asoc/topic/da9055' into asoc-next (diff)
parentASoC: McASP: implement a way to force BCLK/LRCLK ratios (diff)
downloadlinux-1bd202e4c7745459aca6616cd127b2d2bbd29901.tar.xz
linux-1bd202e4c7745459aca6616cd127b2d2bbd29901.zip
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/davinci_asp.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index d0c5825876f8..8db5ae03b6e3 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -16,12 +16,13 @@
#ifndef __DAVINCI_ASP_H
#define __DAVINCI_ASP_H
+#include <linux/genalloc.h>
+
struct snd_platform_data {
u32 tx_dma_offset;
u32 rx_dma_offset;
int asp_chan_q; /* event queue number for ASP channel */
int ram_chan_q; /* event queue number for RAM channel */
- unsigned int codec_fmt;
/*
* Allowing this is more efficient and eliminates left and right swaps
* caused by underruns, but will swap the left and right channels
@@ -30,6 +31,7 @@ struct snd_platform_data {
unsigned enable_channel_combine:1;
unsigned sram_size_playback;
unsigned sram_size_capture;
+ struct gen_pool *sram_pool;
/*
* If McBSP peripheral gets the clock from an external pin,