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: <20100507134334.75808884.sfr@canb.auug.org.au>
Date:	Fri, 7 May 2010 13:43:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...ia.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Roger Quadros <roger.quadros@...ia.com>,
	Jarkko Nikula <jhnikula@...il.com>,
	Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org>
Subject: linux-next: manual merge of the omap_dss2 tree with the omap tree

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e87da74e34ad151e6ae75ebb7a7bf447f02c0004 ("omap: rx51: Add supplies for
the tlv320aic3x codec driver") from the omap tree and commit
a693839eab0292aa234d7a6f48d40389389baebb ("OMAP: RX51: Add "vdds_sdi"
supply voltage for SDI") from the omap_dss2 tree.

Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 8179d55,020f354..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -287,35 -315,19 +315,48 @@@ static struct regulator_consumer_suppl
  	.dev_name = "mmci-omap-hs.1",
  };
  
 +static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
 +	/* tlv320aic3x analog supplies */
 +	{
 +		.supply		= "AVDD",
 +		.dev_name	= "2-0018",
 +	},
 +	{
 +		.supply		= "DRVDD",
 +		.dev_name	= "2-0018",
 +	},
 +	/* Keep vmmc as last item. It is not iterated for newer boards */
 +	{
 +		.supply		= "vmmc",
 +		.dev_name	= "mmci-omap-hs.1",
 +	},
 +};
 +
 +static struct regulator_consumer_supply rx51_vio_supplies[] = {
 +	/* tlv320aic3x digital supplies */
 +	{
 +		.supply		= "IOVDD",
 +		.dev_name	= "2-0018"
 +	},
 +	{
 +		.supply		= "DVDD",
 +		.dev_name	= "2-0018"
 +	},
 +};
 +
+ #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+ extern struct platform_device rx51_display_device;
+ #endif
+ 
+ static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
+ #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+ 	{
+ 		.supply	= "vdds_sdi",
+ 		.dev	= &rx51_display_device.dev,
+ 	},
+ #endif
+ };
+ 
  static struct regulator_init_data rx51_vaux1 = {
  	.constraints = {
  		.name			= "V28",
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/