--- /dev/null
+From 379f831a927817c130a62e3ca0082ae685557324 Mon Sep 17 00:00:00 2001
+From: Andi Shyti <andi.shyti@samsung.com>
+Date: Fri, 10 Feb 2017 11:20:19 +0900
+Subject: spi: s3c64xx: fix inconsistency between binding and driver
+
+From: Andi Shyti <andi.shyti@samsung.com>
+
+commit 379f831a927817c130a62e3ca0082ae685557324 upstream.
+
+Commit a92e7c3d82a1 ("spi: s3c64xx: consider the case when the CS
+line is not connected") introduced an inconsistency between the
+binding, where the disconnected CS line was marked as
+'no-cs-readback', and the driver.
+
+The driver is erroneously checking for that attribute with
+property name of 'broken-cs'.
+
+Check for 'no-cs-readback' in the driver as well.
+
+Fixes: a92e7c3d82a1 ("spi: s3c64xx: consider the case when the CS line is not connected")
+Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
+Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-s3c64xx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/spi-s3c64xx.c
++++ b/drivers/spi/spi-s3c64xx.c
+@@ -996,7 +996,7 @@ static struct s3c64xx_spi_info *s3c64xx_
+ sci->num_cs = temp;
+ }
+
+- sci->no_cs = of_property_read_bool(dev->of_node, "broken-cs");
++ sci->no_cs = of_property_read_bool(dev->of_node, "no-cs-readback");
+
+ return sci;
+ }