Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc-next

2014-06-03 10:39:57 +01:00
parent 770b65c3da 88ce1465ec 29aa37cddf 2942a0e285 772bc594da
commit 39b47b599e
12 changed files with 83 additions and 94 deletions
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -15,6 +15,9 @@ Optional properties:
 					  Each entry is a pair of strings, the first being the
 					  connection's sink, the second being the connection's
 					  source.
+- simple-audio-card,mclk-fs             : Multiplication factor between stream rate and codec
+  					  mclk.
+
 Optional subnodes:

 - simple-audio-card,dai-link		: Container for dai-link level