From 885592f97c01761f24061d514ec8d329fbd95ab2 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Wed, 5 Dec 2012 16:00:07 +0100
Subject: [PATCH] --- yaml --- r: 355711 b: refs/heads/master c:
 77f86144984e4cd375c9dcda83b79f32670f85fe h: refs/heads/master i:   355709:
 98b66cbb42445d8c2979392bf77d0e084a96cfc2   355707:
 ebec1a0a721267883576566e20dee98d5fdd7905   355703:
 ea17989605e696712c7e2d35f1f6a931a5aebc83   355695:
 b3ea05a668a6c0ad08427f49afedc53b7adc5038   355679:
 66c1c28fd764aefa632b0d037d254d10da9b9092   355647:
 bf3a99226cd607f20d22eb8f22f62e46f9d1f3fa   355583:
 dfbc0858b1f4290b9bb6474b997d2f99f65ac441 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm/mach-omap2/board-3430sdp.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 420a1d9149f3..e97ea8309a64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5913935657f81b8c9cae93d1a4200bba7faffb8
+refs/heads/master: 77f86144984e4cd375c9dcda83b79f32670f85fe
diff --git a/trunk/arch/arm/mach-omap2/board-3430sdp.c b/trunk/arch/arm/mach-omap2/board-3430sdp.c
index 40c22a7b80dc..e7ef3111a0f2 100644
--- a/trunk/arch/arm/mach-omap2/board-3430sdp.c
+++ b/trunk/arch/arm/mach-omap2/board-3430sdp.c
@@ -25,6 +25,7 @@
 #include <linux/gpio.h>
 #include <linux/mmc/host.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/omap-twl4030.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -209,6 +210,19 @@ static struct omap2_hsmmc_info mmc[] = {
 	{}	/* Terminator */
 };
 
+static struct omap_tw4030_pdata omap_twl4030_audio_data = {
+	.voice_connected = true,
+	.custom_routing	= true,
+
+	.has_hs		= OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
+	.has_hf		= OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
+
+	.has_mainmic	= true,
+	.has_submic	= true,
+	.has_hsmic	= true,
+	.has_linein	= OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
+};
+
 static int sdp3430_twl_gpio_setup(struct device *dev,
 		unsigned gpio, unsigned ngpio)
 {
@@ -225,6 +239,9 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
 	/* gpio + 15 is "sub_lcd_nRST" (output) */
 	gpio_request_one(gpio + 15, GPIOF_OUT_INIT_LOW, "sub_lcd_nRST");
 
+	omap_twl4030_audio_data.jack_detect = gpio + 2;
+	omap_twl4030_audio_init("SDP3430", &omap_twl4030_audio_data);
+
 	return 0;
 }