From b54d68594397272e58b0c1877ada21893341e7eb Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 20 Oct 2011 13:42:25 +0200
Subject: [PATCH] --- yaml --- r: 284821 b: refs/heads/master c:
 e78bb882bf318bb41e17b33729cca3bdd26b42a0 h: refs/heads/master i:   284819:
 5cd9e4e1724a0c42d4262ed01ac5deab5ca91597 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/cirrusfb.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a5cb909bf40b..0ee1f364a552 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17bdf48952d3f5c0be8137058f81d398d4606820
+refs/heads/master: e78bb882bf318bb41e17b33729cca3bdd26b42a0
diff --git a/trunk/drivers/video/cirrusfb.c b/trunk/drivers/video/cirrusfb.c
index 816433ffec9d..6ea505c6f0c8 100644
--- a/trunk/drivers/video/cirrusfb.c
+++ b/trunk/drivers/video/cirrusfb.c
@@ -314,7 +314,7 @@ static const struct zorrocl zcl_picasso4_z3 __devinitconst = {
 	.type		= BT_PICASSO4,
 	.regoffset	= 0x00600000,
 	.ramsize	= 4 * MB_,
-	.ramoffset	= 0x01000000,
+	.ramoffset	= 0x01000000,	/* 0x02000000 for 64 MiB boards */
 };
 
 static const struct zorrocl zcl_picasso4_z2 __devinitconst = {
@@ -2259,6 +2259,10 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
 	ramsize = zcl->ramsize;
 	if (ramsize) {
 		rambase = zorro_resource_start(z) + zcl->ramoffset;
+		if (zorro_resource_len(z) == 64 * MB_) {
+			/* Quirk for 64 MiB Picasso IV */
+			rambase += zcl->ramoffset;
+		}
 	} else {
 		struct zorro_dev *ram = zorro_find_device(zcl->ramid, NULL);
 		if (!ram || !zorro_resource_len(ram)) {