From 8bdd74708b95f774da108f804ee84dcd1abe25f4 Mon Sep 17 00:00:00 2001 From: Afzal Mohammed <afzal@ti.com> Date: Mon, 31 Dec 2012 15:03:12 +0530 Subject: [PATCH 15/51] video: da8xx-fb: setup struct lcd_ctrl_config for dt strcut lcd_ctrl_config information required for driver is currently obtained via platform data. To handle DT probing, create lcd_ctrl_config and populate it with default values, these values are sufficient for the panels so far used with this controller to work. Signed-off-by: Afzal Mohammed <afzal@ti.com> --- drivers/video/da8xx-fb.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) Index: linux-3.12.36-rt50-r4s2/drivers/video/da8xx-fb.c =================================================================== @ linux-3.12.36-rt50-r4s2/drivers/video/da8xx-fb.c:1315 @ static struct fb_ops da8xx_fb_ops = { .fb_blank = cfb_blank, }; +static struct lcd_ctrl_config *da8xx_fb_create_cfg(struct platform_device *dev) +{ + struct lcd_ctrl_config *cfg; + + cfg = devm_kzalloc(&dev->dev, sizeof(struct fb_videomode), GFP_KERNEL); + if (!cfg) { + dev_err(&dev->dev, "memory allocation failed\n"); + return NULL; + } + + /* default values */ + + if (lcd_revision == LCD_VERSION_1) + cfg->bpp = 16; + else + cfg->bpp = 32; + + /* + * For panels so far used with this LCDC, below statement is sufficient. + * For new panels, if required, struct lcd_ctrl_cfg fields to be updated + * with additional/modified values. Those values would have to be then + * obtained from dt(requiring new dt bindings). + */ + + cfg->panel_shade = COLOR_ACTIVE; + + return cfg; +} + static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev) { struct da8xx_lcdc_platform_data *fb_pdata = dev->dev.platform_data; @ linux-3.12.36-rt50-r4s2/drivers/video/da8xx-fb.c:1434 @ static int fb_probe(struct platform_devi break; } - lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data; + if (device->dev.of_node) + lcd_cfg = da8xx_fb_create_cfg(device); + else + lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data; if (!lcd_cfg) { ret = -EINVAL;