2 files changed, 8 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 {
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index ef7c758627b1..4c9e71c2f52a 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -634,6 +634,13 @@ static int fsl_sai_probe(struct platform_device *pdev)
         fsl_sai_dai.symmetric_channels = 1;
         fsl_sai_dai.symmetric_samplebits = 1;
 
+        if (of_find_property(np, "fsl,sai-synchronous-rx", NULL) &&
+            of_find_property(np, "fsl,sai-asynchronous", NULL)) {
+                /* error out if both synchronous and asynchronous are present */
+                dev_err(&pdev->dev, "invalid binding for synchronous mode\n");
+                return -EINVAL;
+        }
+
         if (of_find_property(np, "fsl,sai-synchronous-rx", NULL)) {
                 /* Sync Rx with Tx */
                 sai->synchronous[RX] = false;