summaryrefslogtreecommitdiffstats
path: root/drivers/video/valkyriefb.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2009-11-04 00:43:52 +1100
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-02-27 18:31:13 +0100
commit11e8faca2e501c25d2f98c1b9534776a9a9704c5 (patch)
tree0f98adbc0b0880e5fc88d47a02c0c39f6f5085bd /drivers/video/valkyriefb.c
parentd876c11a0fd40993136f5cc1e81371ccc6c21a63 (diff)
downloadop-kernel-dev-11e8faca2e501c25d2f98c1b9534776a9a9704c5.zip
op-kernel-dev-11e8faca2e501c25d2f98c1b9534776a9a9704c5.tar.gz
valkyriefb: various fixes
Valkyriefb and macfb will adopt the same card if they get the chance, so remove valkyrie support from macfb. Also fix the "valkyriefb: can't do 832x624x8" problem reported by Raylynn Knight some time ago, by adding vmode 13 support for CONFIG_MAC. Also add vmode 11 since that works too. Make use of the monitor sense lines on 68k Macs too. Also some cleanups. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/video/valkyriefb.c')
-rw-r--r--drivers/video/valkyriefb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 4bb9a0b..6b52bf6 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -69,7 +69,7 @@
#ifdef CONFIG_MAC
/* We don't yet have functions to read the PRAM... perhaps we can
adapt them from the PPC code? */
-static int default_vmode = VMODE_640_480_67;
+static int default_vmode = VMODE_CHOOSE;
static int default_cmode = CMODE_8;
#else
static int default_vmode = VMODE_NVRAM;
@@ -326,11 +326,11 @@ int __init valkyriefb_init(void)
#ifdef CONFIG_MAC
if (!MACH_IS_MAC)
- return 0;
+ return -ENODEV;
if (!(mac_bi_data.id == MAC_MODEL_Q630
/* I'm not sure about this one */
|| mac_bi_data.id == MAC_MODEL_P588))
- return 0;
+ return -ENODEV;
/* Hardcoded addresses... welcome to 68k Macintosh country :-) */
frame_buffer_phys = 0xf9000000;
OpenPOWER on IntegriCloud