Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f36fdacc authored by Linus Walleij's avatar Linus Walleij Committed by Tomi Valkeinen
Browse files

video: ARM CLCD: runtime check for Versatile 



The current compile-time check for inversed IENB/CNTL does not
work in multiplatform boots: as soon as versatile is included
in the build, the IENB/CNTL is switched and breaks graphics.
Convert this to a runtime switch.

Cc: stable@vger.kernel.org
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Fixes: a29da136 ("ARM: versatile: convert to multi-platform")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c3b46c73

drivers/video/fbdev/amba-clcd.c

+8 −7
Original line number Diff line number Diff line
@@ -440,13 +440,14 @@ static int clcdfb_register(struct clcd_fb *fb) 
		fb->off_ienb = CLCD_PL111_IENB;

		fb->off_cntl = CLCD_PL111_CNTL;

	} else {

#ifdef CONFIG_ARCH_VERSATILE

		if (of_machine_is_compatible("arm,versatile-ab") ||

		    of_machine_is_compatible("arm,versatile-pb")) {

			fb->off_ienb = CLCD_PL111_IENB;

			fb->off_cntl = CLCD_PL111_CNTL;

#else

		} else {

			fb->off_ienb = CLCD_PL110_IENB;

			fb->off_cntl = CLCD_PL110_CNTL;

#endif

		}

	}



	fb->clk = clk_get(&fb->dev->dev, NULL);