Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next

2013-11-08 10:43:27 +00:00
parent 1d697db0ab ee2f615d6e
commit ac97d4e00a
8 changed files with 382 additions and 91 deletions
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -84,6 +84,8 @@ struct snd_platform_data {
 	u8 version;
 	u8 txnumevt;
 	u8 rxnumevt;
+	int tx_dma_channel;
+	int rx_dma_channel;
 };

 enum {