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-01-15 21:18:35 -0600
commitd2fc0319a5e0121540a9b26b10ddb6bc7b9eb820 (patch)
tree3f0dd4083ef23be1c1ca1c2f0fcc11ab75a5faa6 /Documentation
parenta83f4d090def316fe862d053de60a1eb94e5e58d (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 {