diff options
Diffstat (limited to 'sound/soc/codecs/rt5651.c')
-rw-r--r-- | sound/soc/codecs/rt5651.c | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index f5d34153e21f..db05b60d5002 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c | |||
@@ -586,44 +586,6 @@ static const struct snd_kcontrol_new hpo_r_mute_control = | |||
586 | SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_HP_VOL, | 586 | SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_HP_VOL, |
587 | RT5651_R_MUTE_SFT, 1, 1); | 587 | RT5651_R_MUTE_SFT, 1, 1); |
588 | 588 | ||
589 | /* INL/R source */ | ||
590 | static const char * const rt5651_inl_src[] = {"IN2P", "HPOVOLLP"}; | ||
591 | |||
592 | static SOC_ENUM_SINGLE_DECL( | ||
593 | rt5651_inl_enum, RT5651_INL1_INR1_VOL, | ||
594 | RT5651_INL_SEL_SFT, rt5651_inl_src); | ||
595 | |||
596 | static const struct snd_kcontrol_new rt5651_inl1_mux = | ||
597 | SOC_DAPM_ENUM("INL1 source", rt5651_inl_enum); | ||
598 | |||
599 | static const char * const rt5651_inr1_src[] = {"IN2N", "HPOVOLRP"}; | ||
600 | |||
601 | static SOC_ENUM_SINGLE_DECL( | ||
602 | rt5651_inr1_enum, RT5651_INL1_INR1_VOL, | ||
603 | RT5651_INR_SEL_SFT, rt5651_inr1_src); | ||
604 | |||
605 | static const struct snd_kcontrol_new rt5651_inr1_mux = | ||
606 | SOC_DAPM_ENUM("INR1 source", rt5651_inr1_enum); | ||
607 | |||
608 | static const char * const rt5651_inl2_src[] = {"IN3P", "OUTVOLLP"}; | ||
609 | |||
610 | static SOC_ENUM_SINGLE_DECL( | ||
611 | rt5651_inl2_enum, RT5651_INL2_INR2_VOL, | ||
612 | RT5651_INL_SEL_SFT, rt5651_inl2_src); | ||
613 | |||
614 | static const struct snd_kcontrol_new rt5651_inl2_mux = | ||
615 | SOC_DAPM_ENUM("INL2 source", rt5651_inl2_enum); | ||
616 | |||
617 | static const char * const rt5651_inr2_src[] = {"IN3N", "OUTVOLRP"}; | ||
618 | |||
619 | static SOC_ENUM_SINGLE_DECL( | ||
620 | rt5651_inr2_enum, RT5651_INL2_INR2_VOL, | ||
621 | RT5651_INR_SEL_SFT, rt5651_inr2_src); | ||
622 | |||
623 | static const struct snd_kcontrol_new rt5651_inr2_mux = | ||
624 | SOC_DAPM_ENUM("INR2 source", rt5651_inr2_enum); | ||
625 | |||
626 | |||
627 | /* Stereo ADC source */ | 589 | /* Stereo ADC source */ |
628 | static const char * const rt5651_stereo1_adc1_src[] = {"DD MIX", "ADC"}; | 590 | static const char * const rt5651_stereo1_adc1_src[] = {"DD MIX", "ADC"}; |
629 | 591 | ||
@@ -955,11 +917,7 @@ static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = { | |||
955 | RT5651_PWR_IN2_L_BIT, 0, NULL, 0), | 917 | RT5651_PWR_IN2_L_BIT, 0, NULL, 0), |
956 | SND_SOC_DAPM_PGA("INR2 VOL", RT5651_PWR_VOL, | 918 | SND_SOC_DAPM_PGA("INR2 VOL", RT5651_PWR_VOL, |
957 | RT5651_PWR_IN2_R_BIT, 0, NULL, 0), | 919 | RT5651_PWR_IN2_R_BIT, 0, NULL, 0), |
958 | /* IN Mux */ | 920 | |
959 | SND_SOC_DAPM_MUX("INL1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl1_mux), | ||
960 | SND_SOC_DAPM_MUX("INR1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr1_mux), | ||
961 | SND_SOC_DAPM_MUX("INL2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl2_mux), | ||
962 | SND_SOC_DAPM_MUX("INR2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr2_mux), | ||
963 | /* REC Mixer */ | 921 | /* REC Mixer */ |
964 | SND_SOC_DAPM_MIXER("RECMIXL", RT5651_PWR_MIXER, RT5651_PWR_RM_L_BIT, 0, | 922 | SND_SOC_DAPM_MIXER("RECMIXL", RT5651_PWR_MIXER, RT5651_PWR_RM_L_BIT, 0, |
965 | rt5651_rec_l_mix, ARRAY_SIZE(rt5651_rec_l_mix)), | 923 | rt5651_rec_l_mix, ARRAY_SIZE(rt5651_rec_l_mix)), |