summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorNicolin Chen <nicoleotsuka@gmail.com>2014-08-08 18:41:19 +0800
committerNitin Garg <nitin.garg@freescale.com>2015-04-14 14:01:05 -0500
commit246a1ae0e42a2c372e1cef46450c0bf6d253a74a (patch)
treeb2e6ab89982afc8e92b373375d5af7d54e947b01 /Documentation
parent2270102026f0e3c2db129685dded56db369072ea (diff)
ASoC: fsl_sai: Make Synchronous and Asynchronous modes exclusive
The previous patch (ASoC: fsl_sai: Add asynchronous mode support) added new Device Tree bindings for Asynchronous and Synchronous modes support. However, these two shall not be present at the same time. So this patch just simply makes them exclusive so as to avoid incorrect Device Tree binding usage. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org> (cherry picked from commit ce7344a4ebabe90e064d3e087727f45624cdc942)
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/sound/fsl-sai.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 77864f4dd352..dc9f9c356268 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -38,8 +38,7 @@ Note:
default synchronous mode (sync Rx with Tx) will be used, which means both
transimitter and receiver will send and receive data by following clocks
of transimitter.
-- fsl,sai-asynchronous will be ignored if fsl,sai-synchronous-rx property is
- already present.
+- fsl,sai-asynchronous and fsl,sai-synchronous-rx are exclusive.
Example:
sai2: sai@40031000 {