diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-13 18:32:26 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-13 18:32:26 +0100 |
commit | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (patch) | |
tree | 9391d740c7646cb7808acd6a14d00e6f42cf4fec /drivers/video/exynos_fb.c | |
parent | 08798026f24bd7c706e70372f8c323f0702c9a15 (diff) | |
parent | b627eb461bb281a00b543e72e74edc197b5f7b5e (diff) |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/video/exynos_fb.c')
-rw-r--r-- | drivers/video/exynos_fb.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index 00a0a11ed4..e1e0d802f6 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -104,6 +104,13 @@ void __exynos_backlight_reset(void) void exynos_backlight_reset(void) __attribute__((weak, alias("__exynos_backlight_reset"))); +int __exynos_lcd_misc_init(vidinfo_t *vid) +{ + return 0; +} +int exynos_lcd_misc_init(vidinfo_t *vid) + __attribute__((weak, alias("__exynos_lcd_misc_init"))); + static void lcd_panel_on(vidinfo_t *vid) { udelay(vid->init_delay); @@ -281,10 +288,15 @@ void lcd_ctrl_init(void *lcdbase) #ifdef CONFIG_OF_CONTROL if (exynos_fimd_parse_dt(gd->fdt_blob)) debug("Can't get proper panel info\n"); +#ifdef CONFIG_EXYNOS_MIPI_DSIM + exynos_init_dsim_platform_data(&panel_info); +#endif + exynos_lcd_misc_init(&panel_info); #else /* initialize parameters which is specific to panel. */ init_panel_info(&panel_info); #endif + panel_width = panel_info.vl_width; panel_height = panel_info.vl_height; |