]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
video: atmel_lcdfb: ensure the hardware is initialized with the correct mode
authorAntoine Ténart <antoine.tenart@free-electrons.com>
Fri, 7 Mar 2014 16:20:54 +0000 (17:20 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 15 May 2014 07:55:25 +0000 (09:55 +0200)
commit 7d3477d801808a5037a511cf5a5aae5718e7ecce upstream.

If no driver takeover the atmel_lcdfb, the lcd won't be in a working state
since atmel_lcdfb_set_par() will never be called. Enabling a driver which does,
like fbcon, will call the function and put atmel_lcdfb in a working state.

Fixes: b985172b328a (video: atmel_lcdfb: add device tree suport)
Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
Reported-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/video/atmel_lcdfb.c

index 088511a58a269abc2126f90969a08f3d75a5b22c..0aca4e6b28711686021d956f9987967d20519dc7 100644 (file)
@@ -1081,6 +1081,12 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                goto free_cmap;
        }
 
+       ret = atmel_lcdfb_set_par(info);
+       if (ret < 0) {
+               dev_err(dev, "set par failed: %d\n", ret);
+               goto unregister_irqs;
+       }
+
        dev_set_drvdata(dev, info);
 
        /*