]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] pxa: fix overlay being un-necessarily initialized on pxa25x
authorEric Miao <eric.miao@marvell.com>
Thu, 19 Mar 2009 07:24:30 +0000 (15:24 +0800)
committerEric Miao <eric.miao@marvell.com>
Thu, 19 Mar 2009 08:20:39 +0000 (16:20 +0800)
pxa25x doesn't support overlay in its LCD controller, this patch adds
pxafb_overlay_supported() functions to check the initialization is
necessary.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
drivers/video/pxafb.c

index 48ff701d3a72b9cd1d5a6cb7b345a89e9678e50d..40a5d9d66755a9c895e9e9dd2a63e81404b0647d 100644 (file)
@@ -883,10 +883,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,
        init_completion(&ofb->branch_done);
 }
 
+static inline int pxafb_overlay_supported(void)
+{
+       if (cpu_is_pxa27x() || cpu_is_pxa3xx())
+               return 1;
+
+       return 0;
+}
+
 static int __devinit pxafb_overlay_init(struct pxafb_info *fbi)
 {
        int i, ret;
 
+       if (!pxafb_overlay_supported())
+               return 0;
+
        for (i = 0; i < 2; i++) {
                init_pxafb_overlay(fbi, &fbi->overlay[i], i);
                ret = register_framebuffer(&fbi->overlay[i].fb);
@@ -909,6 +920,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi)
 {
        int i;
 
+       if (!pxafb_overlay_supported())
+               return;
+
        for (i = 0; i < 2; i++)
                unregister_framebuffer(&fbi->overlay[i].fb);
 }