hi,

On Wed, Feb 3, 2010 at 6:29 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/mach-omap2/board-omap3pandora.c between commit
> f8b6f704105164eac7c043a48f79c4234e03e4b2 ("omap: Rename hsmmc symbols to
> reflect independence from twl4030") from the omap tree and commit
> aacb4387a1e6f3b57977375532c6d8e47fcd5652 ("OMAP: pandora: add DSS2
> support and related regulators") from the omap_dss2 tree.

I've rebased my patch against linux-omap/for-next (attached). To fix
the conflict, Tomi can rebase his queue on linux-omap/for-next, or
Tony can simply take this to his queue - this has no "hard"
dependencies on other queued DSS2 changes, has only board file changes
and builds fine in linux-omap/for-next. I would prefer the second
option, as I plan sending more boardfile changes to linux-omap.

>
> 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-omap3pandora.c
> index 9967b5d,bd3e577..0000000
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@@ -192,7 -193,62 +193,62 @@@ static struct twl4030_keypad_data pando
>        .rep            = 1,
>  };
>
> + static struct omap_dss_device pandora_lcd_device = {
> +       .name                   = "lcd",
> +       .driver_name            = "tpo_td043mtea1_panel",
> +       .type                   = OMAP_DISPLAY_TYPE_DPI,
> +       .phy.dpi.data_lines     = 24,
> +       .reset_gpio             = 157,
> + };
> +
> + static struct omap_dss_device pandora_tv_device = {
> +       .name                   = "tv",
> +       .driver_name            = "venc",
> +       .type                   = OMAP_DISPLAY_TYPE_VENC,
> +       .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
> + };
> +
> + static struct omap_dss_device *pandora_dss_devices[] = {
> +       &pandora_lcd_device,
> +       &pandora_tv_device,
> + };
> +
> + static struct omap_dss_board_info pandora_dss_data = {
> +       .num_devices    = ARRAY_SIZE(pandora_dss_devices),
> +       .devices        = pandora_dss_devices,
> +       .default_device = &pandora_lcd_device,
> + };
> +
> + static struct platform_device pandora_dss_device = {
> +       .name           = "omapdss",
> +       .id             = -1,
> +       .dev            = {
> +               .platform_data = &pandora_dss_data,
> +       },
> + };
> +
> + static struct regulator_consumer_supply pandora_vcc_lcd_supply = {
> +       .supply         = "vcc",
> +       .dev            = &pandora_lcd_device.dev,
> + };
> +
> + static struct regulator_consumer_supply pandora_vdda_dac_supply = {
> +       .supply         = "vdda_dac",
> +       .dev            = &pandora_dss_device.dev,
> + };
> +
> + static struct regulator_consumer_supply pandora_vdds_supplies[] = {
> +       {
> +               .supply         = "vdds_sdi",
> +               .dev            = &pandora_dss_device.dev,
> +       },
> +       {
> +               .supply         = "vdds_dsi",
> +               .dev            = &pandora_dss_device.dev,
> +       },
> + };
> +
>  -static struct twl4030_hsmmc_info omap3pandora_mmc[] = {
>  +static struct omap2_hsmmc_info omap3pandora_mmc[] = {
>        {
>                .mmc            = 1,
>                .wires          = 4,
>