linux-kernel - linux-next: manual merge of the omap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130923122856.0a3dbf72a44dfef1238d7a1c@canb.auug.org.au>
Date:	Mon, 23 Sep 2013 12:28:56 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>,
	Florian Tobias Schandinat <FlorianSchandinat@....de>,
	linux-fbdev@...r.kernel.org
Subject: linux-next: manual merge of the omap_dss2 tree with the fbdev tree

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/atmel_lcdfb.c between commits a17c2e7b704f ("video:
atmel_lcdfb: fix platform data struct") and 5e8be022fb5b ("video:
atmel_lcdfb: add device tree suport") from the fbdev tree and commit
a5d58be0796a ("video: atmel_lcdfb: use dev_get_platdata()") 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@...b.auug.org.au

diff --cc drivers/video/atmel_lcdfb.c
index bf9c5d0,df05550..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;
  
 -	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;
 +	INIT_LIST_HEAD(&info->modelist);
 +
 +	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;

Content of type "application/pgp-signature" skipped