From: Eric Miao <eric.miao@marvell.com>
Date: Thu, 19 Mar 2009 07:24:30 +0000 (+0800)
Subject: [ARM] pxa: fix overlay being un-necessarily initialized on pxa25x
X-Git-Tag: v2.6.30-rc1~636^2^2~4^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=782385ae176b304c7105051e1b06c68bc0b4a2ba;p=karo-tx-linux.git

[ARM] pxa: fix overlay being un-necessarily initialized on pxa25x

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>
---

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 48ff701d3a72..40a5d9d66755 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -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);
 }