aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-05 10:00:07 -0500
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2013-01-22 04:34:57 -0500
commit77f86144984e4cd375c9dcda83b79f32670f85fe (patch)
tree2a373d64255e90b6b209355bddd40653a5697034 /arch/arm/mach-omap2
parentc5913935657f81b8c9cae93d1a4200bba7faffb8 (diff)
ARM: OMAP: sdp3430: Audio support via the common omap-twl4030 machine driver
Use the common omap-twl4030 ASoC machine driver for audio. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-3430sdp.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 40c22a7b80dc..e7ef3111a0f2 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -25,6 +25,7 @@
25#include <linux/gpio.h> 25#include <linux/gpio.h>
26#include <linux/mmc/host.h> 26#include <linux/mmc/host.h>
27#include <linux/platform_data/spi-omap2-mcspi.h> 27#include <linux/platform_data/spi-omap2-mcspi.h>
28#include <linux/platform_data/omap-twl4030.h>
28 29
29#include <asm/mach-types.h> 30#include <asm/mach-types.h>
30#include <asm/mach/arch.h> 31#include <asm/mach/arch.h>
@@ -209,6 +210,19 @@ static struct omap2_hsmmc_info mmc[] = {
209 {} /* Terminator */ 210 {} /* Terminator */
210}; 211};
211 212
213static struct omap_tw4030_pdata omap_twl4030_audio_data = {
214 .voice_connected = true,
215 .custom_routing = true,
216
217 .has_hs = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
218 .has_hf = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
219
220 .has_mainmic = true,
221 .has_submic = true,
222 .has_hsmic = true,
223 .has_linein = OMAP_TWL4030_LEFT | OMAP_TWL4030_RIGHT,
224};
225
212static int sdp3430_twl_gpio_setup(struct device *dev, 226static int sdp3430_twl_gpio_setup(struct device *dev,
213 unsigned gpio, unsigned ngpio) 227 unsigned gpio, unsigned ngpio)
214{ 228{
@@ -225,6 +239,9 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
225 /* gpio + 15 is "sub_lcd_nRST" (output) */ 239 /* gpio + 15 is "sub_lcd_nRST" (output) */
226 gpio_request_one(gpio + 15, GPIOF_OUT_INIT_LOW, "sub_lcd_nRST"); 240 gpio_request_one(gpio + 15, GPIOF_OUT_INIT_LOW, "sub_lcd_nRST");
227 241
242 omap_twl4030_audio_data.jack_detect = gpio + 2;
243 omap_twl4030_audio_init("SDP3430", &omap_twl4030_audio_data);
244
228 return 0; 245 return 0;
229} 246}
230 247