diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-05 16:00:07 +0100 | 
|---|---|---|
| committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-01-22 10:34:57 +0100 | 
| commit | 77f86144984e4cd375c9dcda83b79f32670f85fe (patch) | |
| tree | 2a373d64255e90b6b209355bddd40653a5697034 /arch/arm/mach-omap2/board-3430sdp.c | |
| parent | c5913935657f81b8c9cae93d1a4200bba7faffb8 (diff) | |
| download | olio-linux-3.10-77f86144984e4cd375c9dcda83b79f32670f85fe.tar.xz olio-linux-3.10-77f86144984e4cd375c9dcda83b79f32670f85fe.zip  | |
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/board-3430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 17 | 
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 40c22a7b80d..e7ef3111a0f 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/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;  }  |