Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96dc227c authored by Jorge Eduardo Candelaria's avatar Jorge Eduardo Candelaria Committed by Liam Girdwood
Browse files

ASoC: sdp4430: Add Jack support 



Use jack framework to enable detection for the headset microphone
and stereo output in the sdp4430.

Signed-off-by: default avatarJorge Eduardo Candelaria <jorge.candelaria@ti.com>
Signed-off-by: default avatarDavid Anders <x0132446@ti.com>
Signed-off-by: default avatarMargarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent a2d2362e

sound/soc/omap/sdp4430.c

+32 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/jack.h>



#include <asm/mach-types.h>

#include <plat/hardware.h>
@@ -65,6 +66,21 @@ static struct snd_soc_ops sdp4430_ops = { 
	.hw_params = sdp4430_hw_params,

};



/* Headset jack */

static struct snd_soc_jack hs_jack;



/*Headset jack detection DAPM pins */

static struct snd_soc_jack_pin hs_jack_pins[] = {

	{

		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},

	{

		.pin = "Headset Stereophone",

		.mask = SND_JACK_HEADPHONE,

	},

};



static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{
@@ -160,6 +176,22 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");



	ret = snd_soc_dapm_sync(dapm);

	if (ret)

		return ret;



	/* Headset jack detection */

	ret = snd_soc_jack_new(codec, "Headset Jack",

				SND_JACK_HEADSET, &hs_jack);

	if (ret)

		return ret;



	ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),

				hs_jack_pins);



	if (machine_is_omap_4430sdp())

		twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET);

	else

		snd_soc_jack_report(&hs_jack, SND_JACK_HEADSET, SND_JACK_HEADSET);



	return ret;

}