From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 24 Mar 2012 11:33:59 +0000 (+0000)
Subject: Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound... 
X-Git-Tag: v3.4-rc1~88^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a754a87ce8b17024358c1be8ee0232ef09a7055f;p=~emulex%2Finfiniband.git

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards

The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
	arch/arm/mach-omap2/board-omap4panda.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: Olof Johansson <olof@lixom.net>
---

a754a87ce8b17024358c1be8ee0232ef09a7055f
diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 0a1643c3f17,428459fbca4..f7b074f496f
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -393,10 -263,7 +393,11 @@@ static void __init visstrim_m10_board_i
  	imx27_add_fec(NULL);
  	imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);
  	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+ 	imx_add_platform_device("mx27vis", 0, NULL, 0, NULL, 0);
 +	platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,
 +				      &iclink_tvp5150, sizeof(iclink_tvp5150));
 +	gpio_led_register_device(0, &visstrim_m10_led_data);
 +	visstrim_camera_init();
  }
  
  static void __init visstrim_m10_timer_init(void)
diff --cc arch/arm/mach-omap2/board-omap4panda.c
index b1d74d6b02e,1af564b0487..786674971a6
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -91,15 -92,34 +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 = {