summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-nomadik-s8815.dts
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-07-25 12:18:42 +0200
committerOlof Johansson <olof@lixom.net>2014-07-30 12:47:17 -0700
commit3181788c3ac3a78d43a41b74d77f348b4855627e (patch)
tree22a00c3af5f3c265cc5b382729a7d76a5bc93dca /arch/arm/boot/dts/ste-nomadik-s8815.dts
parenta1ae5b128365f36a3fa2143cfa9de14fc71c51d8 (diff)
downloadop-kernel-dev-3181788c3ac3a78d43a41b74d77f348b4855627e.zip
op-kernel-dev-3181788c3ac3a78d43a41b74d77f348b4855627e.tar.gz
ARM: nomadik: fix up double inversion in DT
The GPIO pin connected to card detect was inverted twice: once by the argument to the GPIO line itself where it was magically marked as active low by the flag GPIO_ACTIVE_LOW (0x01) in the third cell, and also marked active low AGAIN by explicitly stating "cd-inverted" (a deprecated method). After commit 78f87df2b4f8760954d7d80603d0cfcbd4759683 "mmc: mmci: Use the common mmc DT parser" this results in the line being inverted twice so it was effectively uninverted, while the old code would not have this effect, instead disregarding the flag on the GPIO line altogether, which is a bug. I admit the semantics may be unclear but inverting twice is as good a definition as any on how this should work. So fix up the buggy device tree. Use proper #includes so the DTS is clear and readable. Cc: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-s8815.dts')
-rw-r--r--arch/arm/boot/dts/ste-nomadik-s8815.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index f557feb..90d8b6c 100644
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -4,7 +4,7 @@
*/
/dts-v1/;
-/include/ "ste-nomadik-stn8815.dtsi"
+#include "ste-nomadik-stn8815.dtsi"
/ {
model = "Calao Systems USB-S8815";
OpenPOWER on IntegriCloud