From 3c364a69f37f41051ec0a789b1e1523b13f6c027 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 8 Mar 2017 10:18:07 +0100 Subject: [PATCH] 4.9-stable patches added patches: spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch --- queue-4.9/series | 1 + ...nsistency-between-binding-and-driver.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-4.9/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch diff --git a/queue-4.9/series b/queue-4.9/series index 21597033427..f25abc19b8e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -17,3 +17,4 @@ cxd2820r-fix-gpio-null-pointer-dereference.patch lirc_dev-lirc_-g-s-et_rec_mode-do-not-work.patch media-properly-pass-through-media-entity-types-in-entity-enumeration.patch ext4-fix-deadlock-between-inline_data-and-ext4_expand_extra_isize_ea.patch +spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch diff --git a/queue-4.9/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch b/queue-4.9/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch new file mode 100644 index 00000000000..8a231f7030b --- /dev/null +++ b/queue-4.9/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch @@ -0,0 +1,40 @@ +From 379f831a927817c130a62e3ca0082ae685557324 Mon Sep 17 00:00:00 2001 +From: Andi Shyti +Date: Fri, 10 Feb 2017 11:20:19 +0900 +Subject: spi: s3c64xx: fix inconsistency between binding and driver + +From: Andi Shyti + +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 +Reviewed-by: Krzysztof Kozlowski +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1003,7 +1003,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; + } -- 2.47.3