* linux-next: manual merge of the fbdev tree with the omap tree
@ 2011-01-13 1:58 Stephen Rothwell
2011-01-13 16:06 ` Nishanth Menon
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-01-13 1:58 UTC (permalink / raw)
To: Paul Mundt
Cc: linux-next, linux-kernel, Koen Kooi, Nishanth Menon,
Tony Lindgren, Bryan Wu, Tomi Valkeinen
Hi Paul,
Today's linux-next merge of the fbdev tree got a conflict in
arch/arm/mach-omap2/board-omap3beagle.c between commit
f8362d215549c66066f78e67c033dd370ae50322 ("omap3: beaglexm: fix DVI reset
GPIO") from the omap tree and commit
89747c9141cd750a610974d93f71492922b8cbd7 ("OMAP: use generic DPI panel
driver in board files") from the fbdev tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 2ed8040,a4fe8e1..0000000
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -197,11 -204,10 +204,10 @@@ static struct panel_generic_dpi_data dv
static struct omap_dss_device beagle_dvi_device = {
.type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi",
- .driver_name = "generic_panel",
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .reset_gpio = 170,
+ .reset_gpio = -EINVAL,
- .platform_enable = beagle_enable_dvi,
- .platform_disable = beagle_disable_dvi,
};
static struct omap_dss_device beagle_tv_device = {
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the fbdev tree with the omap tree
2011-01-13 1:58 linux-next: manual merge of the fbdev tree with the omap tree Stephen Rothwell
@ 2011-01-13 16:06 ` Nishanth Menon
0 siblings, 0 replies; 2+ messages in thread
From: Nishanth Menon @ 2011-01-13 16:06 UTC (permalink / raw)
To: Stephen Rothwell, Koen Kooi, Tomi Valkeinen
Cc: Paul Mundt, linux-next, linux-kernel, Tony Lindgren, Bryan Wu
Stephen Rothwell had written, on 01/12/2011 07:58 PM, the following:
> Hi Paul,
>
> Today's linux-next merge of the fbdev tree got a conflict in
> arch/arm/mach-omap2/board-omap3beagle.c between commit
> f8362d215549c66066f78e67c033dd370ae50322 ("omap3: beaglexm: fix DVI reset
> GPIO") from the omap tree and commit
> 89747c9141cd750a610974d93f71492922b8cbd7 ("OMAP: use generic DPI panel
> driver in board files") from the fbdev tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> diff --cc arch/arm/mach-omap2/board-omap3beagle.c
> index 2ed8040,a4fe8e1..0000000
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@@ -197,11 -204,10 +204,10 @@@ static struct panel_generic_dpi_data dv
> static struct omap_dss_device beagle_dvi_device = {
> .type = OMAP_DISPLAY_TYPE_DPI,
> .name = "dvi",
> - .driver_name = "generic_panel",
> + .driver_name = "generic_dpi_panel",
> + .data = &dvi_panel,
> .phy.dpi.data_lines = 24,
> - .reset_gpio = 170,
> + .reset_gpio = -EINVAL,
> - .platform_enable = beagle_enable_dvi,
> - .platform_disable = beagle_disable_dvi,
Thanks. Looks fine to me.
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-13 16:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-13 1:58 linux-next: manual merge of the fbdev tree with the omap tree Stephen Rothwell
2011-01-13 16:06 ` Nishanth Menon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox