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

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

[Stephen Rothwell]

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-3430sdp.c between commit
73a92aa4f1d6786eaa5b4e637eee648db0dfd7a7 ("omap3sdp: clean regulator
supply mapping in board file") from the omap tree and commit
b3e0ccec47b179b0d3a7bfdb9df7112e508b009c ("OMAP2,3 DSS2 Change driver
name to omap_display") from the omap_dss2 tree.

I fixed it up (see below) and can carry this fix as necessary (though I
have no idea if it is correct).

[The merge today did, however, lose most of the other conflicts, thanks]
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 8950ecc,b4b89fd..0000000
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -307,9 -307,9 +307,6 @@@ static struct omap_dss_board_info sdp34
  	.default_device	= &sdp3430_lcd_device,
  };
  
--static struct regulator_consumer_supply sdp3430_vdda_dac_supply =
- 	REGULATOR_SUPPLY("vdda_dac", "omapdss");
- 
 -	REGULATOR_SUPPLY("vdda_dac", "omap_venc");
 -
  static struct omap_board_config_kernel sdp3430_config[] __initdata = {
  };
  
@@@ -393,34 -412,6 +390,36 @@@ static struct twl4030_madc_platform_dat
  	.irq_line	= 1,
  };
  
 +/* regulator consumer mappings */
 +
 +/* ads7846 on SPI */
 +static struct regulator_consumer_supply sdp3430_vaux3_supplies[] = {
 +	REGULATOR_SUPPLY("vcc", "spi1.0"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {
- 	REGULATOR_SUPPLY("vdda_dac", "omapdss"),
++	REGULATOR_SUPPLY("vdda_dac", "omap_venc"),
 +};
 +
++
 +/* VPLL2 for digital video outputs */
 +static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
- 	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
++	REGULATOR_SUPPLY("vdds_dsi", "omap_display"),
++	REGULATOR_SUPPLY("vdds_dsi", "omap_dsi1"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {
 +	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vsim_supplies[] = {
 +	REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.0"),
 +};
 +
 +static struct regulator_consumer_supply sdp3430_vmmc2_supplies[] = {
 +	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
 +};
 +
  /*
   * Apply all the fixed voltages since most versions of U-Boot
   * don't bother with that initialization.

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

[Tomi Valkeinen]

Hi,

On Wed, 2011-02-23 at 21:23 -0600, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/mach-omap2/board-3430sdp.c between commit
> 73a92aa4f1d6786eaa5b4e637eee648db0dfd7a7 ("omap3sdp: clean regulator
> supply mapping in board file") from the omap tree and commit
> b3e0ccec47b179b0d3a7bfdb9df7112e508b009c ("OMAP2,3 DSS2 Change driver
> name to omap_display") from the omap_dss2 tree.
> 
> I fixed it up (see below) and can carry this fix as necessary (though I
> have no idea if it is correct).
> 
> [The merge today did, however, lose most of the other conflicts, thanks]

It seems there was a small conflict resolution error when Tony merged my
patches (an extra regulator supply was left in the code). I fixed that
and rebased my tree on Tony's for-linus branch.

So I hope that now we're finally free of non-trivial conflicts =).

Thanks again.

 Tomi

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_44xx_data.c between commit
d63bd74fbb5fb2161d9cb90cd7a93a2c5db47c63 ("OMAP4: hwmod data: Add DSS,
DISPC, DSI1&2, RFBI, HDMI and VENC") from the omap tree and commit
cb93d0b00acd5e5ada8ddd4c8719d4aa390515d2 ("OMAP4: hwmod data: add DSS
DISPC DSI1,2 RFBI HDMI VENC") from the omap_dss2 tree.

So these two commits with essentially the same commit messages and author
dates are quite different :-(.  I used the version from the omap tree.
Please sort this out.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]