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>

1 files changed, 29 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 766f7e47771c..7116ce2321c0 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -41,6 +41,7 @@
 #include <video/omap-panel-nokia-dsi.h>
 #include <video/omap-panel-picodlp.h>
 #include <linux/wl12xx.h>
+#include <linux/platform_data/omap-abe-twl6040.h>
 
 #include "mux.h"
 #include "hsmmc.h"
@@ -381,12 +382,40 @@ static struct platform_device sdp4430_dmic_codec = {
         .id     = -1,
 };
 
+static struct omap_abe_twl6040_data sdp4430_abe_audio_data = {
+        .card_name = "SDP4430",
+        .has_hs         = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+        .has_hf         = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+        .has_ep         = 1,
+        .has_aux        = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+        .has_vibra      = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+
+        .has_dmic       = 1,
+        .has_hsmic      = 1,
+        .has_mainmic    = 1,
+        .has_submic     = 1,
+        .has_afm        = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+
+        .jack_detection = 1,
+        /* MCLK input is 38.4MHz */
+        .mclk_freq      = 38400000,
+};
+
+static struct platform_device sdp4430_abe_audio = {
+        .name           = "omap-abe-twl6040",
+        .id             = -1,
+        .dev = {
+                .platform_data = &sdp4430_abe_audio_data,
+        },
+};
+
 static struct platform_device *sdp4430_devices[] __initdata = {
         &sdp4430_gpio_keys_device,
         &sdp4430_leds_gpio,
         &sdp4430_leds_pwm,
         &sdp4430_vbat,
         &sdp4430_dmic_codec,
+        &sdp4430_abe_audio,
 };
 
 static struct omap_musb_board_data musb_board_data = {