fbdev: simplefb: add init through platform_data

If we create proper platform-devices in x86 boot-code, we can use simplefb
for VBE or EFI framebuffers, too. However, there is normally no OF support
so we introduce a platform_data object so x86 boot-code can pass the
parameters via plain old platform-data.

This also removes the OF dependency as it is not needed. The headers
provide proper dummies for the case OF is disabled.

Furthermore, we move the FORMAT-definitions to the common platform header
so initialization code can use it to transform "struct screen_info" to
the right format-name.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Link: http://lkml.kernel.org/r/1375445127-15480-2-git-send-email-dh.herrmann@gmail.com
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2 files changed, 37 insertions, 16 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/simplefb.c b/drivers/video/simplefb.c
index e2e9e3e61b72..588698986ce1 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;