From 7b00077a6595d241d06ef38f6868bb44d1e913c0 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 4 Dec 2012 10:29:42 +0100 Subject: ARM: OMAP: 3430sdp: Enable extmute functionality for audio Enable the use of extmute on the HS path. Signed-off-by: Peter Ujfalusi --- arch/arm/mach-omap2/board-3430sdp.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-omap2/board-3430sdp.c') diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index bb73afc9ac1..40c22a7b80d 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -382,6 +382,9 @@ static int __init omap3430_i2c_init(void) sdp3430_twldata.vpll2->constraints.apply_uV = true; sdp3430_twldata.vpll2->constraints.name = "VDVI"; + sdp3430_twldata.audio->codec->hs_extmute = 1; + sdp3430_twldata.audio->codec->hs_extmute_gpio = -EINVAL; + omap3_pmic_init("twl4030", &sdp3430_twldata); /* i2c2 on camera connector (for sensor control) and optional isp1301 */ -- cgit v1.2.3-70-g09d2 From 77f86144984e4cd375c9dcda83b79f32670f85fe Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 5 Dec 2012 16:00:07 +0100 Subject: 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 --- arch/arm/mach-omap2/board-3430sdp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'arch/arm/mach-omap2/board-3430sdp.c') 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 #include #include +#include #include #include @@ -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; } -- cgit v1.2.3-70-g09d2