* linux-next: manual merge of the omap_dss2 tree with the fbdev tree
@ 2013-09-23 2:28 Stephen Rothwell
2013-09-23 7:30 ` Tomi Valkeinen
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-09-23 2:28 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: linux-next, linux-kernel, Jingoo Han,
Jean-Christophe PLAGNIOL-VILLARD, Florian Tobias Schandinat,
linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 2348 bytes --]
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@canb.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;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the omap_dss2 tree with the fbdev tree 2013-09-23 2:28 linux-next: manual merge of the omap_dss2 tree with the fbdev tree Stephen Rothwell @ 2013-09-23 7:30 ` Tomi Valkeinen 2013-09-27 5:49 ` Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: Tomi Valkeinen @ 2013-09-23 7:30 UTC (permalink / raw) To: Stephen Rothwell, Jean-Christophe PLAGNIOL-VILLARD Cc: linux-next, linux-kernel, Jingoo Han, Florian Tobias Schandinat, linux-fbdev [-- Attachment #1: Type: text/plain, Size: 711 bytes --] Hi Stephen, Jean-Christophe, On 23/09/13 05:28, Stephen Rothwell wrote: > 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). Jean-Christophe's tree seems to contain some old commits, never pushed to mainline. Jean-Christophe, can you reset your for-next branch? Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 901 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the omap_dss2 tree with the fbdev tree 2013-09-23 7:30 ` Tomi Valkeinen @ 2013-09-27 5:49 ` Stephen Rothwell 0 siblings, 0 replies; 3+ messages in thread From: Stephen Rothwell @ 2013-09-27 5:49 UTC (permalink / raw) To: Tomi Valkeinen Cc: linux-next, linux-kernel, Sachin Kamat, Jean-Christophe PLAGNIOL-VILLARD, Florian Tobias Schandinat, linux-fbdev [-- Attachment #1: Type: text/plain, Size: 2968 bytes --] 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@canb.auug.org.au 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 #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-27 5:49 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-09-23 2:28 linux-next: manual merge of the omap_dss2 tree with the fbdev tree Stephen Rothwell 2013-09-23 7:30 ` Tomi Valkeinen 2013-09-27 5:49 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).