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

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

ASoC: TWL4030: DAPM mapping of the Carkit outputs 



Adds DAPM muxing, routing for the Carkit outputs.

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

sound/soc/codecs/twl4030.c

+37 −0
Original line number Diff line number Diff line
@@ -253,6 +253,30 @@ static const struct soc_enum twl4030_hsor_enum = 
static const struct snd_kcontrol_new twl4030_dapm_hsor_control =

SOC_DAPM_ENUM("Route", twl4030_hsor_enum);



/* Carkit Left */

static const char *twl4030_carkitl_texts[] =

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



static const struct soc_enum twl4030_carkitl_enum =

	SOC_ENUM_SINGLE(TWL4030_REG_PRECKL_CTL, 1,

			ARRAY_SIZE(twl4030_carkitl_texts),

			twl4030_carkitl_texts);



static const struct snd_kcontrol_new twl4030_dapm_carkitl_control =

SOC_DAPM_ENUM("Route", twl4030_carkitl_enum);



/* Carkit Right */

static const char *twl4030_carkitr_texts[] =

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



static const struct soc_enum twl4030_carkitr_enum =

	SOC_ENUM_SINGLE(TWL4030_REG_PRECKR_CTL, 1,

			ARRAY_SIZE(twl4030_carkitr_texts),

			twl4030_carkitr_texts);



static const struct snd_kcontrol_new twl4030_dapm_carkitr_control =

SOC_DAPM_ENUM("Route", twl4030_carkitr_enum);



static int outmixer_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{
@@ -751,6 +775,11 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
		&twl4030_dapm_hsol_control),

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

		&twl4030_dapm_hsor_control),

	/* CarkitL/R */

	SND_SOC_DAPM_MUX("CarkitL Mux", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_carkitl_control),

	SND_SOC_DAPM_MUX("CarkitR Mux", SND_SOC_NOPM, 0, 0,

		&twl4030_dapm_carkitr_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),
@@ -781,6 +810,12 @@ static const struct snd_soc_dapm_route intercon[] = { 
	/* HeadsetR */

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

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

	/* CarkitL */

	{"CarkitL Mux", "DACL1", "ARXL1_APGA"},

	{"CarkitL Mux", "DACL2", "ARXL2_APGA"},

	/* CarkitR */

	{"CarkitR Mux", "DACR1", "ARXR1_APGA"},

	{"CarkitR Mux", "DACR2", "ARXR2_APGA"},



	/* outputs */

	{"OUTL", NULL, "ARXL2_APGA"},
@@ -790,6 +825,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PREDRIVER", NULL, "PredriveR Mux"},

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

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

	{"CARKITL", NULL, "CarkitL Mux"},

	{"CARKITR", NULL, "CarkitR Mux"},



	/* inputs */

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