linux-kernel - linux-next: manual merge of the arm-soc tree with the sound tree

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>] [day] [month] [year] [list]

Date:	Tue, 13 Mar 2012 19:28:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Ujfalusi <peter.ujfalusi@...com>,
	Tony Lindgren <tony@...mide.com>,
	Santosh Shilimkar <santosh.shilimkar@...com>,
	Takashi Iwai <tiwai@...e.de>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>, Mircea Gherzan <mgherzan@...il.com>
Subject: linux-next: manual merge of the arm-soc tree with the sound tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-omap4panda.c between commit 3c90c98a1ebb
("OMAP4: omap4panda: Enable audio support") from the sound tree and
commit 65f19159ddc4 ("ARM: OMAP: enable Bluetooth on the PandaBoard")
from the arm-soc tree.

Just context changes.  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-omap4panda.c
index e441591,3f3055d..0000000
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -92,34 -91,15 +92,40 @@@ static struct platform_device leds_gpi
  	},
  };
  
 +static struct omap_abe_twl6040_data panda_abe_audio_data = {
 +	/* Audio out */
 +	.has_hs		= ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
 +	/* HandsFree through expasion connector */
 +	.has_hf		= ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
 +	/* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */
 +	.has_aux	= ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
 +	/* PandaBoard: FM RX, PandaBoardES: audio in */
 +	.has_afm	= ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
 +	/* No jack detection. */
 +	.jack_detection	= 0,
 +	/* MCLK input is 38.4MHz */
 +	.mclk_freq	= 38400000,
 +
 +};
 +
 +static struct platform_device panda_abe_audio = {
 +	.name		= "omap-abe-twl6040",
 +	.id		= -1,
 +	.dev = {
 +		.platform_data = &panda_abe_audio_data,
 +	},
 +};
 +
+ static struct platform_device btwilink_device = {
+ 	.name	= "btwilink",
+ 	.id	= -1,
+ };
+ 
  static struct platform_device *panda_devices[] __initdata = {
  	&leds_gpio,
  	&wl1271_device,
 +	&panda_abe_audio,
+ 	&btwilink_device,
  };
  
  static const struct usbhs_omap_board_data usbhs_bdata __initconst = {

Content of type "application/pgp-signature" skipped