[PATCH] ARM: dts: gemini: Re-enable display controller

[PATCH] ARM: dts: gemini: Re-enable display controller

[Linus Walleij]

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>
---
ARM SoC folks: please apply this directly for ARM
SoC, as it is a regression fix (late) for a bug
appearing in the v5.0-rc cycle, it should be tagged for
stable if it does not make it into the merge window.
---
 arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index 6198fe5f698a..c0f26558092e 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>;
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: dts: gemini: Re-enable display controller

[Arnd Bergmann]

On Sun, Feb 24, 2019 at 12:05 AM Linus Walleij <linus.walleij@linaro.org> wrote:
>
> 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>
> ---
> ARM SoC folks: please apply this directly for ARM
> SoC, as it is a regression fix (late) for a bug
> appearing in the v5.0-rc cycle, it should be tagged for
> stable if it does not make it into the merge window.
> ---
>  arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to arm/fixes now, thanks!

       Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel