Commit dfad21a2 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: TWL4030: DAPM mapping of the Headset outputs 



Adds DAPM muxing, routing for the Headset outputs.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2a6f5c58

sound/soc/codecs/twl4030.c

+39 −0
Original line number Diff line number Diff line
@@ -229,6 +229,30 @@ static const struct soc_enum twl4030_predriver_enum = 
static const struct snd_kcontrol_new twl4030_dapm_predriver_control =

SOC_DAPM_ENUM("Route", twl4030_predriver_enum);



/* Headset Left */

static const char *twl4030_hsol_texts[] =

		{"Off", "DACL1", "DACL2"};



static const struct soc_enum twl4030_hsol_enum =

	SOC_ENUM_SINGLE(TWL4030_REG_HS_SEL, 1,

			ARRAY_SIZE(twl4030_hsol_texts),

			twl4030_hsol_texts);



static const struct snd_kcontrol_new twl4030_dapm_hsol_control =

SOC_DAPM_ENUM("Route", twl4030_hsol_enum);



/* Headset Right */

static const char *twl4030_hsor_texts[] =

		{"Off", "DACR1", "DACR2"};



static const struct soc_enum twl4030_hsor_enum =

	SOC_ENUM_SINGLE(TWL4030_REG_HS_SEL, 4,

			ARRAY_SIZE(twl4030_hsor_texts),

			twl4030_hsor_texts);



static const struct snd_kcontrol_new twl4030_dapm_hsor_control =

SOC_DAPM_ENUM("Route", twl4030_hsor_enum);



static int outmixer_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{
@@ -687,6 +711,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
	SND_SOC_DAPM_OUTPUT("EARPIECE"),

	SND_SOC_DAPM_OUTPUT("PREDRIVEL"),

	SND_SOC_DAPM_OUTPUT("PREDRIVER"),

	SND_SOC_DAPM_OUTPUT("HSOL"),

	SND_SOC_DAPM_OUTPUT("HSOR"),



	/* DACs */

	SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
@@ -720,6 +746,11 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
	SND_SOC_DAPM_MUX_E("PredriveR Mux", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_predriver_control, outmixer_event,

		SND_SOC_DAPM_PRE_REG),

	/* HeadsetL/R */

	SND_SOC_DAPM_MUX("HeadsetL Mux", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_hsol_control),

	SND_SOC_DAPM_MUX("HeadsetR Mux", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_hsor_control),



	SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
@@ -744,6 +775,12 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PredriveR Mux", "DACR1", "ARXR1_APGA"},

	{"PredriveR Mux", "DACR2", "ARXR2_APGA"},

	{"PredriveR Mux", "DACL2", "ARXL2_APGA"},

	/* HeadsetL */

	{"HeadsetL Mux", "DACL1", "ARXL1_APGA"},

	{"HeadsetL Mux", "DACL2", "ARXL2_APGA"},

	/* HeadsetR */

	{"HeadsetR Mux", "DACR1", "ARXR1_APGA"},

	{"HeadsetR Mux", "DACR2", "ARXR2_APGA"},



	/* outputs */

	{"OUTL", NULL, "ARXL2_APGA"},
@@ -751,6 +788,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"EARPIECE", NULL, "Earpiece Mux"},

	{"PREDRIVEL", NULL, "PredriveL Mux"},

	{"PREDRIVER", NULL, "PredriveR Mux"},

	{"HSOL", NULL, "HeadsetL Mux"},

	{"HSOR", NULL, "HeadsetR Mux"},



	/* inputs */

	{"ADCL", NULL, "INL"},