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

Commit 273de376 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' of... 

Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.39
parents 3d8b2ce0 8cda9751

sound/soc/codecs/twl6040.c

+2 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



void twl6040_hs_jack_report(struct snd_soc_codec *codec,

static void twl6040_hs_jack_report(struct snd_soc_codec *codec,

				   struct snd_soc_jack *jack, int report)

{

	struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);

sound/soc/omap/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config SND_OMAP_SOC_RX51 
	select OMAP_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TPA6130A2

	help

	  Say Y if you want to add support for SoC audio on Nokia RX-51

	  hardware. This is also known as Nokia N900 product.

sound/soc/omap/rx51.c

+89 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <sound/pcm.h>

#include <sound/soc.h>

#include <plat/mcbsp.h>

#include "../codecs/tpa6130a2.h"



#include <asm/mach-types.h>
@@ -47,7 +48,8 @@ 


enum {

	RX51_JACK_DISABLED,

	RX51_JACK_TVOUT,		/* tv-out */

	RX51_JACK_TVOUT,		/* tv-out with stereo output */

	RX51_JACK_HP,			/* headphone: stereo output, no mic */

};



static int rx51_spk_func;
@@ -57,6 +59,15 @@ static int rx51_jack_func; 
static void rx51_ext_control(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int hp = 0, tvout = 0;



	switch (rx51_jack_func) {

	case RX51_JACK_TVOUT:

		tvout = 1;

	case RX51_JACK_HP:

		hp = 1;

		break;

	}



	if (rx51_spk_func)

		snd_soc_dapm_enable_pin(dapm, "Ext Spk");
@@ -66,9 +77,12 @@ static void rx51_ext_control(struct snd_soc_codec *codec) 
		snd_soc_dapm_enable_pin(dapm, "DMic");

	else

		snd_soc_dapm_disable_pin(dapm, "DMic");

	if (hp)

		snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

	else

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");



	gpio_set_value(RX51_TVOUT_SEL_GPIO,

		       rx51_jack_func == RX51_JACK_TVOUT);

	gpio_set_value(RX51_TVOUT_SEL_GPIO, tvout);



	snd_soc_dapm_sync(dapm);

}
@@ -153,6 +167,19 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int rx51_hp_event(struct snd_soc_dapm_widget *w,

			 struct snd_kcontrol *k, int event)

{

	struct snd_soc_codec *codec = w->dapm->codec;



	if (SND_SOC_DAPM_EVENT_ON(event))

		tpa6130a2_stereo_enable(codec, 1);

	else

		tpa6130a2_stereo_enable(codec, 0);



	return 0;

}



static int rx51_get_input(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_value *ucontrol)

{
@@ -212,19 +239,31 @@ static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = { 
static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {

	SND_SOC_DAPM_SPK("Ext Spk", rx51_spk_event),

	SND_SOC_DAPM_MIC("DMic", NULL),

	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[] = {

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

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

	{"Headphone Jack", NULL, "LLOUT"},

	{"Headphone Jack", NULL, "RLOUT"},



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

	{"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 *input_function[] = {"ADC", "Digital Mic"};

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

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



static const struct soc_enum rx51_enum[] = {

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
@@ -241,6 +280,10 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = { 
		     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)

{

	struct snd_soc_codec *codec = rtd->codec;
@@ -265,6 +308,11 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) 
	/* Set up RX-51 specific audio path audio_map */

	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));



	err = tpa6130a2_add_controls(codec);

	if (err < 0)

		return err;

	snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);



	snd_soc_dapm_sync(dapm);



	/* AV jack detection */
@@ -279,6 +327,24 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) 
	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 */

static struct snd_soc_dai_link rx51_dai[] = {

	{
@@ -293,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 */

static struct snd_soc_card rx51_sound_card = {

	.name = "RX-51",

	.dai_link = 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;