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

Commit 8cda9751 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood
Browse files

ASoC: omap: rx51: Add earphone support 



Earphone in Nokia RX-51/N900 is connected to left HP output of B part of the
TLV320AIC34 dual codec. In RX-51 the codec A is used as a traditional codec
and the codec B as an auxiliary device.

Audio from codec A goes via the codec B to earphone:
MONO_LOUT of A -> LINE2R of B (B interconnects) -> HPLOUT of B -> Earphone.

Take earphone into use by utilizing the recent ASoC auxiliary and
cross-device support.

Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 48529b3b

sound/soc/omap/rx51.c

+50 −0
Original line number Original line Diff line number Diff line
@@ -242,6 +242,10 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = { 
	SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event),

	SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event),

};

};





static const struct snd_soc_dapm_widget aic34_dapm_widgetsb[] = {

	SND_SOC_DAPM_SPK("Earphone", NULL),

};



static const struct snd_soc_dapm_route audio_map[] = {

static const struct snd_soc_dapm_route audio_map[] = {

	{"Ext Spk", NULL, "HPLOUT"},

	{"Ext Spk", NULL, "HPLOUT"},

	{"Ext Spk", NULL, "HPROUT"},

	{"Ext Spk", NULL, "HPROUT"},
@@ -252,6 +256,11 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"Mic Bias 2V", NULL, "DMic"},

	{"Mic Bias 2V", NULL, "DMic"},

};

};





static const struct snd_soc_dapm_route audio_mapb[] = {

	{"b LINE2R", NULL, "MONO_LOUT"},

	{"Earphone", NULL, "b HPLOUT"},

};



static const char *spk_function[] = {"Off", "On"};

static const char *spk_function[] = {"Off", "On"};

static const char *input_function[] = {"ADC", "Digital Mic"};

static const char *input_function[] = {"ADC", "Digital Mic"};

static const char *jack_function[] = {"Off", "TV-OUT", "Headphone"};

static const char *jack_function[] = {"Off", "TV-OUT", "Headphone"};
@@ -271,6 +280,10 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = { 
		     rx51_get_jack, rx51_set_jack),

		     rx51_get_jack, rx51_set_jack),

};

};





static const struct snd_kcontrol_new aic34_rx51_controlsb[] = {

	SOC_DAPM_PIN_SWITCH("Earphone"),

};



static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)

static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)

{

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = rtd->codec;
@@ -314,6 +327,24 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) 
	return err;

	return err;

}

}





static int rx51_aic34b_init(struct snd_soc_dapm_context *dapm)

{

	int err;



	err = snd_soc_add_controls(dapm->codec, aic34_rx51_controlsb,

				   ARRAY_SIZE(aic34_rx51_controlsb));

	if (err < 0)

		return err;



	err = snd_soc_dapm_new_controls(dapm, aic34_dapm_widgetsb,

					ARRAY_SIZE(aic34_dapm_widgetsb));

	if (err < 0)

		return 0;



	return snd_soc_dapm_add_routes(dapm, audio_mapb,

				       ARRAY_SIZE(audio_mapb));

}



/* Digital audio interface glue - connects codec <--> CPU */

/* Digital audio interface glue - connects codec <--> CPU */

static struct snd_soc_dai_link rx51_dai[] = {

static struct snd_soc_dai_link rx51_dai[] = {

	{

	{
@@ -328,11 +359,30 @@ static struct snd_soc_dai_link rx51_dai[] = { 
	},

	},

};

};





struct snd_soc_aux_dev rx51_aux_dev[] = {

	{

		.name = "TLV320AIC34b",

		.codec_name = "tlv320aic3x-codec.2-0019",

		.init = rx51_aic34b_init,

	},

};



static struct snd_soc_codec_conf rx51_codec_conf[] = {

	{

		.dev_name = "tlv320aic3x-codec.2-0019",

		.name_prefix = "b",

	},

};



/* Audio card */

/* Audio card */

static struct snd_soc_card rx51_sound_card = {

static struct snd_soc_card rx51_sound_card = {

	.name = "RX-51",

	.name = "RX-51",

	.dai_link = rx51_dai,

	.dai_link = rx51_dai,

	.num_links = ARRAY_SIZE(rx51_dai),

	.num_links = ARRAY_SIZE(rx51_dai),

	.aux_dev = rx51_aux_dev,

	.num_aux_devs = ARRAY_SIZE(rx51_aux_dev),

	.codec_conf = rx51_codec_conf,

	.num_configs = ARRAY_SIZE(rx51_codec_conf),

};

};





static struct platform_device *rx51_snd_device;

static struct platform_device *rx51_snd_device;