ASoC: TWL4030: DAPM mapping of the PreDriv outputs
Adds DAPM muxing, routing for the PreDrive outputs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
5e98a46449
commit
2a6f5c5892
|
@ -203,6 +203,32 @@ static const struct soc_enum twl4030_earpiece_enum =
|
||||||
static const struct snd_kcontrol_new twl4030_dapm_earpiece_control =
|
static const struct snd_kcontrol_new twl4030_dapm_earpiece_control =
|
||||||
SOC_DAPM_ENUM("Route", twl4030_earpiece_enum);
|
SOC_DAPM_ENUM("Route", twl4030_earpiece_enum);
|
||||||
|
|
||||||
|
/* PreDrive Left */
|
||||||
|
static const char *twl4030_predrivel_texts[] =
|
||||||
|
{"Off", "DACL1", "DACL2", "Invalid",
|
||||||
|
"DACR2"};
|
||||||
|
|
||||||
|
static const struct soc_enum twl4030_predrivel_enum =
|
||||||
|
SOC_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1,
|
||||||
|
ARRAY_SIZE(twl4030_predrivel_texts),
|
||||||
|
twl4030_predrivel_texts);
|
||||||
|
|
||||||
|
static const struct snd_kcontrol_new twl4030_dapm_predrivel_control =
|
||||||
|
SOC_DAPM_ENUM("Route", twl4030_predrivel_enum);
|
||||||
|
|
||||||
|
/* PreDrive Right */
|
||||||
|
static const char *twl4030_predriver_texts[] =
|
||||||
|
{"Off", "DACR1", "DACR2", "Invalid",
|
||||||
|
"DACL2"};
|
||||||
|
|
||||||
|
static const struct soc_enum twl4030_predriver_enum =
|
||||||
|
SOC_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1,
|
||||||
|
ARRAY_SIZE(twl4030_predriver_texts),
|
||||||
|
twl4030_predriver_texts);
|
||||||
|
|
||||||
|
static const struct snd_kcontrol_new twl4030_dapm_predriver_control =
|
||||||
|
SOC_DAPM_ENUM("Route", twl4030_predriver_enum);
|
||||||
|
|
||||||
static int outmixer_event(struct snd_soc_dapm_widget *w,
|
static int outmixer_event(struct snd_soc_dapm_widget *w,
|
||||||
struct snd_kcontrol *kcontrol, int event)
|
struct snd_kcontrol *kcontrol, int event)
|
||||||
{
|
{
|
||||||
|
@ -659,6 +685,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
|
||||||
SND_SOC_DAPM_OUTPUT("OUTL"),
|
SND_SOC_DAPM_OUTPUT("OUTL"),
|
||||||
SND_SOC_DAPM_OUTPUT("OUTR"),
|
SND_SOC_DAPM_OUTPUT("OUTR"),
|
||||||
SND_SOC_DAPM_OUTPUT("EARPIECE"),
|
SND_SOC_DAPM_OUTPUT("EARPIECE"),
|
||||||
|
SND_SOC_DAPM_OUTPUT("PREDRIVEL"),
|
||||||
|
SND_SOC_DAPM_OUTPUT("PREDRIVER"),
|
||||||
|
|
||||||
/* DACs */
|
/* DACs */
|
||||||
SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
|
SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
|
||||||
|
@ -685,6 +713,13 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
|
||||||
SND_SOC_DAPM_MUX_E("Earpiece Mux", SND_SOC_NOPM, 0, 0,
|
SND_SOC_DAPM_MUX_E("Earpiece Mux", SND_SOC_NOPM, 0, 0,
|
||||||
&twl4030_dapm_earpiece_control, outmixer_event,
|
&twl4030_dapm_earpiece_control, outmixer_event,
|
||||||
SND_SOC_DAPM_PRE_REG),
|
SND_SOC_DAPM_PRE_REG),
|
||||||
|
/* PreDrivL/R */
|
||||||
|
SND_SOC_DAPM_MUX_E("PredriveL Mux", SND_SOC_NOPM, 0, 0,
|
||||||
|
&twl4030_dapm_predrivel_control, outmixer_event,
|
||||||
|
SND_SOC_DAPM_PRE_REG),
|
||||||
|
SND_SOC_DAPM_MUX_E("PredriveR Mux", SND_SOC_NOPM, 0, 0,
|
||||||
|
&twl4030_dapm_predriver_control, outmixer_event,
|
||||||
|
SND_SOC_DAPM_PRE_REG),
|
||||||
|
|
||||||
SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
|
SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
|
||||||
SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
|
SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
|
||||||
|
@ -701,11 +736,21 @@ static const struct snd_soc_dapm_route intercon[] = {
|
||||||
{"Earpiece Mux", "DACL1", "ARXL1_APGA"},
|
{"Earpiece Mux", "DACL1", "ARXL1_APGA"},
|
||||||
{"Earpiece Mux", "DACL2", "ARXL2_APGA"},
|
{"Earpiece Mux", "DACL2", "ARXL2_APGA"},
|
||||||
{"Earpiece Mux", "DACR1", "ARXR1_APGA"},
|
{"Earpiece Mux", "DACR1", "ARXR1_APGA"},
|
||||||
|
/* PreDrivL */
|
||||||
|
{"PredriveL Mux", "DACL1", "ARXL1_APGA"},
|
||||||
|
{"PredriveL Mux", "DACL2", "ARXL2_APGA"},
|
||||||
|
{"PredriveL Mux", "DACR2", "ARXR2_APGA"},
|
||||||
|
/* PreDrivR */
|
||||||
|
{"PredriveR Mux", "DACR1", "ARXR1_APGA"},
|
||||||
|
{"PredriveR Mux", "DACR2", "ARXR2_APGA"},
|
||||||
|
{"PredriveR Mux", "DACL2", "ARXL2_APGA"},
|
||||||
|
|
||||||
/* outputs */
|
/* outputs */
|
||||||
{"OUTL", NULL, "ARXL2_APGA"},
|
{"OUTL", NULL, "ARXL2_APGA"},
|
||||||
{"OUTR", NULL, "ARXR2_APGA"},
|
{"OUTR", NULL, "ARXR2_APGA"},
|
||||||
{"EARPIECE", NULL, "Earpiece Mux"},
|
{"EARPIECE", NULL, "Earpiece Mux"},
|
||||||
|
{"PREDRIVEL", NULL, "PredriveL Mux"},
|
||||||
|
{"PREDRIVER", NULL, "PredriveR Mux"},
|
||||||
|
|
||||||
/* inputs */
|
/* inputs */
|
||||||
{"ADCL", NULL, "INL"},
|
{"ADCL", NULL, "INL"},
|
||||||
|
|
Loading…
Reference in New Issue