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

2013-08-22 14:28:49 +01:00 · 2013-08-22 14:28:49 +01:00 · c41788c091
commit c41788c091
parent 3f151cbf76 06b10ff913
13 changed files with 248 additions and 137 deletions
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@ -36,6 +36,7 @@ struct samsung_i2s {
 */
 #define QUIRK_NO_MUXPSR		(1 << 2)
 #define QUIRK_NEED_RSTCLR	(1 << 3)
+#define QUIRK_SUPPORTS_TDM	(1 << 4)
 	/* Quirks of the I2S controller */
 	u32 quirks;
 	dma_addr_t idma_addr;