Merge tag 'fbdev-v5.1' of git://github.com/bzolnier/linux

[sfrench/cifs-2.6.git] / drivers / video / fbdev / imsttfb.c

diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index b268570b019d7e6b2b7ce81d6106f489b3f01212..4b9615e4ce746242015010cdf7b0d956c0fde6f5 100644 (file)
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -30,9 +30,8 @@
 #include <asm/io.h>
 #include <linux/uaccess.h>
 
-#if defined(CONFIG_PPC)
+#if defined(CONFIG_PPC_PMAC)
 #include <linux/nvram.h>
-#include <asm/prom.h>
 #include "macmodes.h"
 #endif
 
@@ -327,14 +326,13 @@ enum {
        TVP = 1
 };
 
-#define USE_NV_MODES           1
 #define INIT_BPP               8
 #define INIT_XRES              640
 #define INIT_YRES              480
 
 static int inverse = 0;
 static char fontname[40] __initdata = { 0 };
-#if defined(CONFIG_PPC)
+#if defined(CONFIG_PPC_PMAC)
 static signed char init_vmode = -1, init_cmode = -1;
 #endif
 
@@ -1390,8 +1388,8 @@ static void init_imstt(struct fb_info *info)
                }
        }
 
-#if USE_NV_MODES && defined(CONFIG_PPC32)
-       {
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
+       if (IS_REACHABLE(CONFIG_NVRAM) && machine_is(powermac)) {
                int vmode = init_vmode, cmode = init_cmode;
 
                if (vmode == -1) {
@@ -1409,12 +1407,13 @@ static void init_imstt(struct fb_info *info)
                        info->var.yres = info->var.yres_virtual = INIT_YRES;
                        info->var.bits_per_pixel = INIT_BPP;
                }
-       }
-#else
-       info->var.xres = info->var.xres_virtual = INIT_XRES;
-       info->var.yres = info->var.yres_virtual = INIT_YRES;
-       info->var.bits_per_pixel = INIT_BPP;
+       } else
 #endif
+       {
+               info->var.xres = info->var.xres_virtual = INIT_XRES;
+               info->var.yres = info->var.yres_virtual = INIT_YRES;
+               info->var.bits_per_pixel = INIT_BPP;
+       }
 
        if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >> 3) > info->fix.smem_len
            || !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {
@@ -1565,7 +1564,7 @@ imsttfb_setup(char *options)
                        inverse = 1;
                        fb_invert_cmaps();
                }
-#if defined(CONFIG_PPC)
+#if defined(CONFIG_PPC_PMAC)
                else if (!strncmp(this_opt, "vmode:", 6)) {
                        int vmode = simple_strtoul(this_opt+6, NULL, 0);
                        if (vmode > 0 && vmode <= VMODE_MAX)