linux-next: manual merge of the omap_dss2 tree with the fbdev tree

[Stephen Rothwell]

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/atmel_lcdfb.c between commit 5e8be022fb5b ("video:
atmel_lcdfb: add device tree suport") from the fbdev tree and commit
a36bf1925539 ("video: atmel_lcdfb: Remove redundant dev_set_drvdata")
from the omap_dss2 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/video/atmel_lcdfb.c
index bf9c5d0,3f7d6dc..0000000
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@@ -1157,30 -934,19 +1157,30 @@@ static int __init atmel_lcdfb_probe(str
  	}
  
  	sinfo = info->par;
 +	sinfo->pdev = pdev;
 +	sinfo->info = info;
 +
 +	INIT_LIST_HEAD(&info->modelist);
  
 -	if (dev_get_platdata(dev)) {
 -		pdata_sinfo = dev_get_platdata(dev);
 -		sinfo->default_bpp = pdata_sinfo->default_bpp;
 -		sinfo->default_dmacon = pdata_sinfo->default_dmacon;
 -		sinfo->default_lcdcon2 = pdata_sinfo->default_lcdcon2;
 -		sinfo->default_monspecs = pdata_sinfo->default_monspecs;
 -		sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
 -		sinfo->guard_time = pdata_sinfo->guard_time;
 -		sinfo->smem_len = pdata_sinfo->smem_len;
 -		sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight;
 -		sinfo->lcdcon_pol_negative = pdata_sinfo->lcdcon_pol_negative;
 -		sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode;
 +	if (pdev->dev.of_node) {
 +		ret = atmel_lcdfb_of_init(sinfo);
 +		if (ret)
 +			goto free_info;
- 	} else if (dev->platform_data) {
++	} else if (dev_get_platdata(dev)) {
 +		struct fb_monspecs *monspecs;
 +		int i;
 +
- 		pdata = dev->platform_data;
++		pdata = dev_get_platdata(dev);
 +		monspecs = pdata->default_monspecs;
 +		sinfo->pdata = *pdata;
 +
 +		for (i = 0; i < monspecs->modedb_len; i++)
 +			fb_add_videomode(&monspecs->modedb[i], &info->modelist);
 +
 +		sinfo->config = atmel_lcdfb_get_config(pdev);
 +
 +		info->var.bits_per_pixel = pdata->default_bpp ? pdata->default_bpp : 16;
 +		memcpy(&info->monspecs, pdata->default_monspecs, sizeof(info->monspecs));
  	} else {
  		dev_err(dev, "cannot get default configuration\n");
  		goto free_info;
@@@ -1305,11 -1089,16 +1305,11 @@@
  	ret = register_framebuffer(info);
  	if (ret < 0) {
  		dev_err(dev, "failed to register framebuffer device: %d\n", ret);
- 		goto reset_drvdata;
+ 		goto free_cmap;
  	}
  
 -	/* add selected videomode to modelist */
 -	fb_var_to_videomode(&fbmode, &info->var);
 -	fb_add_videomode(&fbmode, &info->modelist);
 -
  	/* Power up the LCDC screen */
 -	if (sinfo->atmel_lcdfb_power_control)
 -		sinfo->atmel_lcdfb_power_control(1);
 +	atmel_lcdfb_power_control(sinfo, 1);
  
  	dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n",
  		       info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);

Attachment: pgp00000.pgp
Description: PGP signature