[PATCH] video: ARM CLCD: fix Vexpress regression

Amit Pundir amit.pundir at linaro.org
Fri Oct 21 20:44:31 PDT 2016


On 20 October 2016 at 14:46, Linus Walleij <linus.walleij at linaro.org> wrote:
> The CLCD does not come up on Versatile Express as it does not
> (currently) have a syscon node for controlling the block apart
> from the CLCD itself. Make sure the .init() function can bail
> out without an error making it probe again.
>
> Reported-by: Amit Pundir <amit.pundir at linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
> ---
>  drivers/video/fbdev/amba-clcd-versatile.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c
> index 19ad8645d93c..d909b7dda14d 100644
> --- a/drivers/video/fbdev/amba-clcd-versatile.c
> +++ b/drivers/video/fbdev/amba-clcd-versatile.c
> @@ -527,7 +527,8 @@ int versatile_clcd_init_panel(struct clcd_fb *fb,
>                                              &clcd_id);
>         if (!np) {
>                 dev_err(dev, "no Versatile syscon node\n");
> -               return -ENODEV;
> +               /* Vexpress does not have this */
> +               return 0;
>         }
>         versatile_clcd_type = (enum versatile_clcd)clcd_id->data;

Thanks. Works on my Qemu + Android setup.

Tested-by: Amit Pundir <amit.pundir at linaro.org>

>
> --
> 2.7.4
>



More information about the linux-arm-kernel mailing list