Patch "video: ARM CLCD: runtime check for Versatile" has been added to the 4.5-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
video: ARM CLCD: runtime check for Versatile
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
video-arm-clcd-runtime-check-for-versatile.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
f36fdacc5fcdca7b0c0d89f031fcdc89717e0be3Mon Sep 17 00:00:00 2001
From: Linus Walleij <[email protected]>
Date: Tue, 23 Feb 2016 11:01:38 +0100
Subject: video: ARM CLCD: runtime check for Versatile
From: Linus Walleij <[email protected]>
commit f36fdacc5fcdca7b0c0d89f031fcdc89717e0be3 upstream.
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.
--- drivers/video/fbdev/amba-clcd.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/fbdev/amba-clcd.c +8 -7
@@ -440,13 +440,14 @@ static int clcdfb_register(struct clcd_f fb->off_ienb =CLCD_PL111_IENB ; fb->off_cntl =CLCD_PL111_CNTL ; }else { -#ifdef CONFIG_ARCH_VERSATILE - fb->off_ienb =CLCD_PL111_IENB ; - fb->off_cntl =CLCD_PL111_CNTL ; -#else - fb->off_ienb =CLCD_PL110_IENB ; - fb->off_cntl =CLCD_PL110_CNTL ; -#endif +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 { + fb->off_ienb =CLCD_PL110_IENB ; + fb->off_cntl =CLCD_PL110_CNTL ; + } } fb->clk =clk_get (&fb->dev->dev,NULL );
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/pinctrl-mediatek-correct-debounce-time-unit-in-mtk_gpio_set_debounce.patch queue-4.5/pinctrl-single-fix-pcs_parse_bits_in_pinctrl_entry-to-use-__ffs-than-ffs.patch queue-4.5/video-arm-clcd-runtime-check-for-versatile.patch