summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-02-24 00:04:52 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-25 11:16:30 +0100
commit014e90ca44eeb8434f135e26a3cc17e57d64d85d (patch)
tree148e96b96688ec3212389caa1a0b078d65c5568f /arch
parentLinux 5.0-rc8 (diff)
downloadlinux-014e90ca44eeb8434f135e26a3cc17e57d64d85d.tar.xz
linux-014e90ca44eeb8434f135e26a3cc17e57d64d85d.zip
ARM: dts: gemini: Re-enable display controller
commit 137cd7100ec6fa36d610e106df00acb4d8af99df "ARM: dts: Enable Gemini flash access" contained a bug by disabling the display controller, while the whole idea with the patch was to enable flash access AND the display controller, simultaneously. Fix it up. Fixes: 137cd7100ec6 ("ARM: dts: Enable Gemini flash access") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/gemini-dlink-dir-685.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index cc0c3cf89eaa..592111c8d6fd 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -443,7 +443,7 @@
};
display-controller@6a000000 {
- status = "disabled";
+ status = "okay";
port@0 {
reg = <0>;