| Message ID | 1375208791-15781-22-git-send-email-detheridge@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30/07/13 21:26, Darren Etheridge wrote: > From: Afzal Mohammed <afzal@ti.com> > > 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> > Signed-off-by: Darren Etheridge <detheridge@ti.com> > --- > drivers/video/da8xx-fb.c | 34 +++++++++++++++++++++++++++++++++- > 1 files changed, 33 insertions(+), 1 deletions(-) > > diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c > index 697b07c..fe3d79e 100644 > --- a/drivers/video/da8xx-fb.c > +++ b/drivers/video/da8xx-fb.c <snip> > static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev) > { > struct da8xx_lcdc_platform_data *fb_pdata = dev->dev.platform_data; > @@ -1346,7 +1375,10 @@ static int fb_probe(struct platform_device *device) > break; > } > > - lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data; In the previous patch you allow fb_pdata==NULL if booting with DT. However, this patch shows that fb_pdata is still accessed. So I think you need to move the previous patch after this to avoid a crash between this and the previous patch. > + if (device->dev.of_node) > + lcd_cfg = da8xx_fb_create_cfg(device); > + else > + lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data; fb_pdata->controller_data is void *, so you don't need to cast it explicitly. Tomi
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 697b07c..fe3d79e 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1255,6 +1255,35 @@ 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; @@ -1346,7 +1375,10 @@ static int fb_probe(struct platform_device *device) 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;