Signed-off-by: Franck Jullien <franck.jull...@gmail.com>
---
drivers/video/fbdev/Kconfig | 2 ++
drivers/video/fbdev/ocfb.c | 31 ++++++++++++++++++++++++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index e1f4727..b4ac6bb 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -942,6 +942,8 @@ config FB_OPENCORES
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
+ select VIDEOMODE_HELPERS
+ select FB_MODE_HELPERS
help
This enables support for the OpenCores VGA/LCD core.
diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c
index 7f9dc9b..6d15565 100644
--- a/drivers/video/fbdev/ocfb.c
+++ b/drivers/video/fbdev/ocfb.c
@@ -22,6 +22,8 @@
#include <linux/string.h>
#include <linux/slab.h>
+#include <video/of_display_timing.h>
+
/* OCFB register defines */
#define OCFB_CTRL 0x000
#define OCFB_STAT 0x004
@@ -310,11 +312,30 @@ static int ocfb_probe(struct platform_device *pdev)
fbdev->info.device = &pdev->dev;
fbdev->info.par = fbdev;
- /* Video mode setup */
- if (!fb_find_mode(&fbdev->info.var, &fbdev->info, mode_option,
- NULL, 0, &default_mode, 16)) {
- dev_err(&pdev->dev, "No valid video modes found\n");
- return -EINVAL;
+ if (!mode_option && IS_ENABLED(CONFIG_OF)) {
+ struct fb_videomode mode;
+ u32 bpp;
+
+ ret = of_get_fb_videomode(pdev->dev.of_node, &mode,
+ OF_USE_NATIVE_MODE);
+ if (ret)
+ return ret;
+
+ fb_videomode_to_var(&fbdev->info.var, &mode);
+
+ ret = of_property_read_u32(pdev->dev.of_node, "bits-per-pixel",
+ &bpp);
+ if (ret)
+ return ret;
+
+ fbdev->info.var.bits_per_pixel = bpp;
+
+ } else {
+ if (!fb_find_mode(&fbdev->info.var, &fbdev->info, mode_option,
+ NULL, 0, &default_mode, 16)) {
+ dev_err(&pdev->dev, "No valid video modes found\n");
+ return -EINVAL;
+ }
}
ocfb_init_var(fbdev);
ocfb_init_fix(fbdev);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
