diff options
author | Jin Park <jinyoungp@nvidia.com> | 2011-05-12 01:58:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-16 00:26:26 -0400 |
commit | 938b4fbc916667cbe0410c325e7163c99a08c05f (patch) | |
tree | b312eaf28e36ad95f1f04a03b56301f5ec0593c5 /sound/soc | |
parent | 770939c37feb4b9c88f4de8482ff922af64d20ee (diff) |
ASoC: codecs: max98088: Moved the EX Limiter Mode from dapm widget to control
Moved the EX Limiter Mode from dapm widget to control, because it was not
required DAPM route.
Signed-off-by: Jin Park <jinyoungp@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/max98088.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 87cd5f68807a..16eb90666c45 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
@@ -656,8 +656,6 @@ static const struct soc_enum max98088_exmode_enum = | |||
656 | ARRAY_SIZE(max98088_exmode_texts), | 656 | ARRAY_SIZE(max98088_exmode_texts), |
657 | max98088_exmode_texts, | 657 | max98088_exmode_texts, |
658 | max98088_exmode_values); | 658 | max98088_exmode_values); |
659 | static const struct snd_kcontrol_new max98088_exmode_controls = | ||
660 | SOC_DAPM_VALUE_ENUM("Route", max98088_exmode_enum); | ||
661 | 659 | ||
662 | static const char *max98088_ex_thresh[] = { /* volts PP */ | 660 | static const char *max98088_ex_thresh[] = { /* volts PP */ |
663 | "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; | 661 | "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; |
@@ -783,6 +781,7 @@ static const struct snd_kcontrol_new max98088_snd_controls[] = { | |||
783 | SOC_SINGLE("EQ1 Switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), | 781 | SOC_SINGLE("EQ1 Switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), |
784 | SOC_SINGLE("EQ2 Switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), | 782 | SOC_SINGLE("EQ2 Switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), |
785 | 783 | ||
784 | SOC_ENUM("EX Limiter Mode", max98088_exmode_enum), | ||
786 | SOC_ENUM("EX Limiter Threshold", max98088_ex_thresh_enum), | 785 | SOC_ENUM("EX Limiter Threshold", max98088_ex_thresh_enum), |
787 | 786 | ||
788 | SOC_ENUM("DAI1 Filter Mode", max98088_filter_mode_enum), | 787 | SOC_ENUM("DAI1 Filter Mode", max98088_filter_mode_enum), |
@@ -1094,9 +1093,6 @@ static const struct snd_soc_dapm_widget max98088_dapm_widgets[] = { | |||
1094 | 1093 | ||
1095 | SND_SOC_DAPM_MICBIAS("MICBIAS", M98088_REG_4C_PWR_EN_IN, 3, 0), | 1094 | SND_SOC_DAPM_MICBIAS("MICBIAS", M98088_REG_4C_PWR_EN_IN, 3, 0), |
1096 | 1095 | ||
1097 | SND_SOC_DAPM_MUX("EX Limiter Mode", SND_SOC_NOPM, 0, 0, | ||
1098 | &max98088_exmode_controls), | ||
1099 | |||
1100 | SND_SOC_DAPM_OUTPUT("HPL"), | 1096 | SND_SOC_DAPM_OUTPUT("HPL"), |
1101 | SND_SOC_DAPM_OUTPUT("HPR"), | 1097 | SND_SOC_DAPM_OUTPUT("HPR"), |
1102 | SND_SOC_DAPM_OUTPUT("SPKL"), | 1098 | SND_SOC_DAPM_OUTPUT("SPKL"), |