Merge branch 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fb changes from Ingo Molnar:
 "This tree includes preparatory patches for SimpleDRM driver support,
  by David Herrmann.  They clean up x86 framebuffer support by creating
  simplefb devices wherever possible.  More background can be found at

     http://lwn.net/Articles/558104/"

* 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  fbdev: fbcon: select VT_HW_CONSOLE_BINDING
  fbdev: efifb: bind to efi-framebuffer
  fbdev: vesafb: bind to platform-framebuffer device
  fbdev: simplefb: add common x86 RGB formats
  x86: sysfb: move EFI quirks from efifb to sysfb
  x86: provide platform-devices for boot-framebuffers
  fbdev: simplefb: mark as fw and allocate apertures
  fbdev: simplefb: add init through platform_data

5 files changed, 93 insertions, 330 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4cf1e1dd5621..34c3d960634d 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2457,7 +2457,7 @@ config FB_HYPERV
 
 config FB_SIMPLE
         bool "Simple framebuffer support"
-        depends on (FB = y) && OF
+        depends on (FB = y)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -2469,8 +2469,7 @@ config FB_SIMPLE
           pre-allocated frame buffer surface.
 
           Configuration re: surface address, size, and format must be provided
-          through device tree, or potentially plain old platform data in the
-          future.
+          through device tree, or plain old platform data.
 
 source "drivers/video/omap/Kconfig"
 source "drivers/video/omap2/Kconfig"
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 8c30603e0a86..846caab75a46 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -92,7 +92,8 @@ config DUMMY_CONSOLE_ROWS
 
 config FRAMEBUFFER_CONSOLE
         tristate "Framebuffer Console support"
-        depends on FB
+        depends on FB && !UML
+        select VT_HW_CONSOLE_BINDING
         select CRC32
         select FONT_SUPPORT
         help
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index 50fe668c6172..2a8286ef2645 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -15,6 +15,7 @@
 #include <linux/dmi.h>
 #include <linux/pci.h>
 #include <video/vga.h>
+#include <asm/sysfb.h>
 
 static bool request_mem_succeeded = false;
 
@@ -38,223 +39,6 @@ static struct fb_fix_screeninfo efifb_fix = {
         .visual                 = FB_VISUAL_TRUECOLOR,
 };
 
-enum {
-        M_I17,          /* 17-Inch iMac */
-        M_I20,          /* 20-Inch iMac */
-        M_I20_SR,       /* 20-Inch iMac (Santa Rosa) */
-        M_I24,          /* 24-Inch iMac */
-        M_I24_8_1,      /* 24-Inch iMac, 8,1th gen */
-        M_I24_10_1,     /* 24-Inch iMac, 10,1th gen */
-        M_I27_11_1,     /* 27-Inch iMac, 11,1th gen */
-        M_MINI,         /* Mac Mini */
-        M_MINI_3_1,     /* Mac Mini, 3,1th gen */
-        M_MINI_4_1,     /* Mac Mini, 4,1th gen */
-        M_MB,           /* MacBook */
-        M_MB_2,         /* MacBook, 2nd rev. */
-        M_MB_3,         /* MacBook, 3rd rev. */
-        M_MB_5_1,       /* MacBook, 5th rev. */
-        M_MB_6_1,       /* MacBook, 6th rev. */
-        M_MB_7_1,       /* MacBook, 7th rev. */
-        M_MB_SR,        /* MacBook, 2nd gen, (Santa Rosa) */
-        M_MBA,          /* MacBook Air */
-        M_MBA_3,        /* Macbook Air, 3rd rev */
-        M_MBP,          /* MacBook Pro */
-        M_MBP_2,        /* MacBook Pro 2nd gen */
-        M_MBP_2_2,      /* MacBook Pro 2,2nd gen */
-        M_MBP_SR,       /* MacBook Pro (Santa Rosa) */
-        M_MBP_4,        /* MacBook Pro, 4th gen */
-        M_MBP_5_1,    /* MacBook Pro, 5,1th gen */
-        M_MBP_5_2,      /* MacBook Pro, 5,2th gen */
-        M_MBP_5_3,      /* MacBook Pro, 5,3rd gen */
-        M_MBP_6_1,      /* MacBook Pro, 6,1th gen */
-        M_MBP_6_2,      /* MacBook Pro, 6,2th gen */
-        M_MBP_7_1,      /* MacBook Pro, 7,1th gen */
-        M_MBP_8_2,      /* MacBook Pro, 8,2nd gen */
-        M_UNKNOWN       /* placeholder */
-};
-
-#define OVERRIDE_NONE   0x0
-#define OVERRIDE_BASE   0x1
-#define OVERRIDE_STRIDE 0x2
-#define OVERRIDE_HEIGHT 0x4
-#define OVERRIDE_WIDTH  0x8
-
-static struct efifb_dmi_info {
-        char *optname;
-        unsigned long base;
-        int stride;
-        int width;
-        int height;
-        int flags;
-} dmi_list[] __initdata = {
-        [M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050, OVERRIDE_NONE }, /* guess */
-        [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050, OVERRIDE_NONE },
-        [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE }, /* guess */
-        [M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
-        [M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080, OVERRIDE_NONE },
-        [M_I27_11_1] = { "imac11", 0xc0010000, 2560 * 4, 2560, 1440, OVERRIDE_NONE },
-        [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768, OVERRIDE_NONE },
-        [M_MINI_3_1] = { "mini31", 0x40010000, 1024 * 4, 1024, 768, OVERRIDE_NONE },
-        [M_MINI_4_1] = { "mini41", 0xc0010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
-        [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
-        [M_MB_5_1] = { "macbook51", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
-        [M_MB_6_1] = { "macbook61", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
-        [M_MB_7_1] = { "macbook71", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
-        [M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
-        /* 11" Macbook Air 3,1 passes the wrong stride */
-        [M_MBA_3] = { "mba3", 0, 2048 * 4, 0, 0, OVERRIDE_STRIDE },
-        [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_MBP_2] = { "mbp2", 0, 0, 0, 0, OVERRIDE_NONE }, /* placeholder */
-        [M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
-        [M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_MBP_5_2] = { "mbp52", 0xc0010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
-        [M_MBP_5_3] = { "mbp53", 0xd0010000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_MBP_6_1] = { "mbp61", 0x90030000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
-        [M_MBP_6_2] = { "mbp62", 0x90030000, 2048 * 4, 1680, 1050, OVERRIDE_NONE },
-        [M_MBP_7_1] = { "mbp71", 0xc0010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
-        [M_MBP_8_2] = { "mbp82", 0x90010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
-        [M_UNKNOWN] = { NULL, 0, 0, 0, 0, OVERRIDE_NONE }
-};
-
-static int set_system(const struct dmi_system_id *id);
-
-#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)               \
-        { set_system, name, {                                   \
-                DMI_MATCH(DMI_BIOS_VENDOR, vendor),             \
-                DMI_MATCH(DMI_PRODUCT_NAME, name) },            \
-          &dmi_list[enumid] }
-
-static const struct dmi_system_id dmi_system_table[] __initconst = {
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),
-        /* At least one of these two will be right; maybe both? */
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),
-        /* At least one of these two will be right; maybe both? */
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac8,1", M_I24_8_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac10,1", M_I24_10_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac11,1", M_I27_11_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini3,1", M_MINI_3_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini4,1", M_MINI_4_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
-        /* At least one of these two will be right; maybe both? */
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),
-        /* At least one of these two will be right; maybe both? */
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook5,1", M_MB_5_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook6,1", M_MB_6_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook7,1", M_MB_7_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir3,1", M_MBA_3),
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,2", M_MBP_2_2),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
-        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,1", M_MBP_5_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,2", M_MBP_5_2),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,3", M_MBP_5_3),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro6,1", M_MBP_6_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro6,2", M_MBP_6_2),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro7,1", M_MBP_7_1),
-        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro8,2", M_MBP_8_2),
-        {},
-};
-
-#define choose_value(dmivalue, fwvalue, field, flags) ({        \
-                typeof(fwvalue) _ret_ = fwvalue;                \
-                if ((flags) & (field))                          \
-                        _ret_ = dmivalue;                       \
-                else if ((fwvalue) == 0)                        \
-                        _ret_ = dmivalue;                       \
-                _ret_;                                          \
-        })
-
-static int set_system(const struct dmi_system_id *id)
-{
-        struct efifb_dmi_info *info = id->driver_data;
-
-        if (info->base == 0 && info->height == 0 && info->width == 0
-                        && info->stride == 0)
-                return 0;
-
-        /* Trust the bootloader over the DMI tables */
-        if (screen_info.lfb_base == 0) {
-#if defined(CONFIG_PCI)
-                struct pci_dev *dev = NULL;
-                int found_bar = 0;
-#endif
-                if (info->base) {
-                        screen_info.lfb_base = choose_value(info->base,
-                                screen_info.lfb_base, OVERRIDE_BASE,
-                                info->flags);
-
-#if defined(CONFIG_PCI)
-                        /* make sure that the address in the table is actually
-                         * on a VGA device's PCI BAR */
-
-                        for_each_pci_dev(dev) {
-                                int i;
-                                if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
-                                        continue;
-                                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                                        resource_size_t start, end;
-
-                                        start = pci_resource_start(dev, i);
-                                        if (start == 0)
-                                                break;
-                                        end = pci_resource_end(dev, i);
-                                        if (screen_info.lfb_base >= start &&
-                                            screen_info.lfb_base < end) {
-                                                found_bar = 1;
-                                        }
-                                }
-                        }
-                        if (!found_bar)
-                                screen_info.lfb_base = 0;
-#endif
-                }
-        }
-        if (screen_info.lfb_base) {
-                screen_info.lfb_linelength = choose_value(info->stride,
-                        screen_info.lfb_linelength, OVERRIDE_STRIDE,
-                        info->flags);
-                screen_info.lfb_width = choose_value(info->width,
-                        screen_info.lfb_width, OVERRIDE_WIDTH,
-                        info->flags);
-                screen_info.lfb_height = choose_value(info->height,
-                        screen_info.lfb_height, OVERRIDE_HEIGHT,
-                        info->flags);
-                if (screen_info.orig_video_isVGA == 0)
-                        screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
-        } else {
-                screen_info.lfb_linelength = 0;
-                screen_info.lfb_width = 0;
-                screen_info.lfb_height = 0;
-                screen_info.orig_video_isVGA = 0;
-                return 0;
-        }
-
-        printk(KERN_INFO "efifb: dmi detected %s - framebuffer at 0x%08x "
-                         "(%dx%d, stride %d)\n", id->ident,
-                         screen_info.lfb_base, screen_info.lfb_width,
-                         screen_info.lfb_height, screen_info.lfb_linelength);
-
-
-        return 1;
-}
-
 static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
                            struct fb_info *info)
@@ -312,7 +96,7 @@ void vga_set_default_device(struct pci_dev *pdev)
         default_vga = pdev;
 }
 
-static int __init efifb_setup(char *options)
+static int efifb_setup(char *options)
 {
         char *this_opt;
         int i;
@@ -323,12 +107,12 @@ static int __init efifb_setup(char *options)
                         if (!*this_opt) continue;
 
                         for (i = 0; i < M_UNKNOWN; i++) {
-                                if (!strcmp(this_opt, dmi_list[i].optname) &&
-                                    dmi_list[i].base != 0) {
-                                        screen_info.lfb_base = dmi_list[i].base;
-                                        screen_info.lfb_linelength = dmi_list[i].stride;
-                                        screen_info.lfb_width = dmi_list[i].width;
-                                        screen_info.lfb_height = dmi_list[i].height;
+                                if (!strcmp(this_opt, efifb_dmi_list[i].optname) &&
+                                    efifb_dmi_list[i].base != 0) {
+                                        screen_info.lfb_base = efifb_dmi_list[i].base;
+                                        screen_info.lfb_linelength = efifb_dmi_list[i].stride;
+                                        screen_info.lfb_width = efifb_dmi_list[i].width;
+                                        screen_info.lfb_height = efifb_dmi_list[i].height;
                                 }
                         }
                         if (!strncmp(this_opt, "base:", 5))
@@ -369,13 +153,28 @@ static int __init efifb_setup(char *options)
         return 0;
 }
 
-static int __init efifb_probe(struct platform_device *dev)
+static int efifb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         int err;
         unsigned int size_vmode;
         unsigned int size_remap;
         unsigned int size_total;
+        char *option = NULL;
+
+        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
+                return -ENODEV;
+
+        if (fb_get_options("efifb", &option))
+                return -ENODEV;
+        efifb_setup(option);
+
+        /* We don't get linelength from UGA Draw Protocol, only from
+         * EFI Graphics Protocol.  So if it's not in DMI, and it's not
+         * passed in from the user, we really can't use the framebuffer.
+         */
+        if (!screen_info.lfb_linelength)
+                return -ENODEV;
 
         if (!screen_info.lfb_depth)
                 screen_info.lfb_depth = 32;
@@ -539,55 +338,12 @@ err_release_mem:
 }
 
 static struct platform_driver efifb_driver = {
-        .driver = {
-                .name   = "efifb",
+        .driver = {
+                .name = "efi-framebuffer",
+                .owner = THIS_MODULE,
         },
+        .probe = efifb_probe,
 };
 
-static struct platform_device efifb_device = {
-        .name   = "efifb",
-};
-
-static int __init efifb_init(void)
-{
-        int ret;
-        char *option = NULL;
-
-        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI ||
-            !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
-                dmi_check_system(dmi_system_table);
-
-        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
-                return -ENODEV;
-
-        if (fb_get_options("efifb", &option))
-                return -ENODEV;
-        efifb_setup(option);
-
-        /* We don't get linelength from UGA Draw Protocol, only from
-         * EFI Graphics Protocol.  So if it's not in DMI, and it's not
-         * passed in from the user, we really can't use the framebuffer.
-         */
-        if (!screen_info.lfb_linelength)
-                return -ENODEV;
-
-        ret = platform_device_register(&efifb_device);
-        if (ret)
-                return ret;
-
-        /*
-         * This is not just an optimization.  We will interfere
-         * with a real driver if we get reprobed, so don't allow
-         * it.
-         */
-        ret = platform_driver_probe(&efifb_driver, efifb_probe);
-        if (ret) {
-                platform_device_unregister(&efifb_device);
-                return ret;
-        }
-
-        return ret;
-}
-module_init(efifb_init);
-
+module_platform_driver(efifb_driver);
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index e2e9e3e61b72..8d7810613058 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -24,6 +24,7 @@
 #include <linux/fb.h>
 #include <linux/io.h>
 #include <linux/module.h>
+#include <linux/platform_data/simplefb.h>
 #include <linux/platform_device.h>
 
 static struct fb_fix_screeninfo simplefb_fix = {
@@ -73,18 +74,7 @@ static struct fb_ops simplefb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-struct simplefb_format {
-        const char *name;
-        u32 bits_per_pixel;
-        struct fb_bitfield red;
-        struct fb_bitfield green;
-        struct fb_bitfield blue;
-        struct fb_bitfield transp;
-};
-
-static struct simplefb_format simplefb_formats[] = {
-        { "r5g6b5", 16, {11, 5}, {5, 6}, {0, 5}, {0, 0} },
-};
+static struct simplefb_format simplefb_formats[] = SIMPLEFB_FORMATS;
 
 struct simplefb_params {
         u32 width;
@@ -139,6 +129,33 @@ static int simplefb_parse_dt(struct platform_device *pdev,
         return 0;
 }
 
+static int simplefb_parse_pd(struct platform_device *pdev,
+                             struct simplefb_params *params)
+{
+        struct simplefb_platform_data *pd = pdev->dev.platform_data;
+        int i;
+
+        params->width = pd->width;
+        params->height = pd->height;
+        params->stride = pd->stride;
+
+        params->format = NULL;
+        for (i = 0; i < ARRAY_SIZE(simplefb_formats); i++) {
+                if (strcmp(pd->format, simplefb_formats[i].name))
+                        continue;
+
+                params->format = &simplefb_formats[i];
+                break;
+        }
+
+        if (!params->format) {
+                dev_err(&pdev->dev, "Invalid format value\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int simplefb_probe(struct platform_device *pdev)
 {
         int ret;
@@ -149,7 +166,12 @@ static int simplefb_probe(struct platform_device *pdev)
         if (fb_get_options("simplefb", NULL))
                 return -ENODEV;
 
-        ret = simplefb_parse_dt(pdev, &params);
+        ret = -ENODEV;
+        if (pdev->dev.platform_data)
+                ret = simplefb_parse_pd(pdev, &params);
+        else if (pdev->dev.of_node)
+                ret = simplefb_parse_dt(pdev, &params);
+
         if (ret)
                 return ret;
 
@@ -180,8 +202,16 @@ static int simplefb_probe(struct platform_device *pdev)
         info->var.blue = params.format->blue;
         info->var.transp = params.format->transp;
 
+        info->apertures = alloc_apertures(1);
+        if (!info->apertures) {
+                framebuffer_release(info);
+                return -ENOMEM;
+        }
+        info->apertures->ranges[0].base = info->fix.smem_start;
+        info->apertures->ranges[0].size = info->fix.smem_len;
+
         info->fbops = &simplefb_ops;
-        info->flags = FBINFO_DEFAULT;
+        info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE;
         info->screen_base = devm_ioremap(&pdev->dev, info->fix.smem_start,
                                          info->fix.smem_len);
         if (!info->screen_base) {
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 501b3406c6d5..bd83233ec227 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -29,7 +29,7 @@
 
 /* --------------------------------------------------------------------- */
 
-static struct fb_var_screeninfo vesafb_defined __initdata = {
+static struct fb_var_screeninfo vesafb_defined = {
         .activate       = FB_ACTIVATE_NOW,
         .height         = -1,
         .width          = -1,
@@ -40,7 +40,7 @@ static struct fb_var_screeninfo vesafb_defined __initdata = {
         .vmode          = FB_VMODE_NONINTERLACED,
 };
 
-static struct fb_fix_screeninfo vesafb_fix __initdata = {
+static struct fb_fix_screeninfo vesafb_fix = {
         .id     = "VESA VGA",
         .type   = FB_TYPE_PACKED_PIXELS,
         .accel  = FB_ACCEL_NONE,
@@ -48,8 +48,8 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
 
 static int   inverse    __read_mostly;
 static int   mtrr       __read_mostly;          /* disable mtrr */
-static int   vram_remap __initdata;             /* Set amount of memory to be used */
-static int   vram_total __initdata;             /* Set total amount of memory */
+static int   vram_remap;                        /* Set amount of memory to be used */
+static int   vram_total;                        /* Set total amount of memory */
 static int   pmi_setpal __read_mostly = 1;      /* pmi for palette changes ??? */
 static int   ypan       __read_mostly;          /* 0..nothing, 1..ypan, 2..ywrap */
 static void  (*pmi_start)(void) __read_mostly;
@@ -192,7 +192,7 @@ static struct fb_ops vesafb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int __init vesafb_setup(char *options)
+static int vesafb_setup(char *options)
 {
         char *this_opt;
         
@@ -226,13 +226,18 @@ static int __init vesafb_setup(char *options)
         return 0;
 }
 
-static int __init vesafb_probe(struct platform_device *dev)
+static int vesafb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         int i, err;
         unsigned int size_vmode;
         unsigned int size_remap;
         unsigned int size_total;
+        char *option = NULL;
+
+        /* ignore error return of fb_get_options */
+        fb_get_options("vesafb", &option);
+        vesafb_setup(option);
 
         if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
                 return -ENODEV;
@@ -496,40 +501,12 @@ err:
 }
 
 static struct platform_driver vesafb_driver = {
-        .driver = {
-                .name   = "vesafb",
+        .driver = {
+                .name = "vesa-framebuffer",
+                .owner = THIS_MODULE,
         },
+        .probe = vesafb_probe,
 };
 
-static struct platform_device *vesafb_device;
-
-static int __init vesafb_init(void)
-{
-        int ret;
-        char *option = NULL;
-
-        /* ignore error return of fb_get_options */
-        fb_get_options("vesafb", &option);
-        vesafb_setup(option);
-
-        vesafb_device = platform_device_alloc("vesafb", 0);
-        if (!vesafb_device)
-                return -ENOMEM;
-
-        ret = platform_device_add(vesafb_device);
-        if (!ret) {
-                ret = platform_driver_probe(&vesafb_driver, vesafb_probe);
-                if (ret)
-                        platform_device_del(vesafb_device);
-        }
-
-        if (ret) {
-                platform_device_put(vesafb_device);
-                vesafb_device = NULL;
-        }
-
-        return ret;
-}
-module_init(vesafb_init);
-
+module_platform_driver(vesafb_driver);
 MODULE_LICENSE("GPL");