]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: rt5651: remove unexisting Muxes
authorBard Liao <bardliao@realtek.com>
Tue, 27 Jun 2017 02:28:44 +0000 (10:28 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 28 Jun 2017 19:01:53 +0000 (20:01 +0100)
These MUXes are unexisting. So, remove them.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5651.c

index f5d34153e21fc4cf10c3e9d45436ad9e14efa166..db05b60d50029c3d53b1bdbc5ad5d0118687887a 100644 (file)
@@ -586,44 +586,6 @@ static const struct snd_kcontrol_new hpo_r_mute_control =
        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_HP_VOL,
                                    RT5651_R_MUTE_SFT, 1, 1);
 
-/* INL/R source */
-static const char * const rt5651_inl_src[] = {"IN2P", "HPOVOLLP"};
-
-static SOC_ENUM_SINGLE_DECL(
-       rt5651_inl_enum, RT5651_INL1_INR1_VOL,
-       RT5651_INL_SEL_SFT, rt5651_inl_src);
-
-static const struct snd_kcontrol_new rt5651_inl1_mux =
-       SOC_DAPM_ENUM("INL1 source", rt5651_inl_enum);
-
-static const char * const rt5651_inr1_src[] = {"IN2N", "HPOVOLRP"};
-
-static SOC_ENUM_SINGLE_DECL(
-       rt5651_inr1_enum, RT5651_INL1_INR1_VOL,
-       RT5651_INR_SEL_SFT, rt5651_inr1_src);
-
-static const struct snd_kcontrol_new rt5651_inr1_mux =
-       SOC_DAPM_ENUM("INR1 source", rt5651_inr1_enum);
-
-static const char * const rt5651_inl2_src[] = {"IN3P", "OUTVOLLP"};
-
-static SOC_ENUM_SINGLE_DECL(
-       rt5651_inl2_enum, RT5651_INL2_INR2_VOL,
-       RT5651_INL_SEL_SFT, rt5651_inl2_src);
-
-static const struct snd_kcontrol_new rt5651_inl2_mux =
-       SOC_DAPM_ENUM("INL2 source", rt5651_inl2_enum);
-
-static const char * const rt5651_inr2_src[] = {"IN3N", "OUTVOLRP"};
-
-static SOC_ENUM_SINGLE_DECL(
-       rt5651_inr2_enum, RT5651_INL2_INR2_VOL,
-       RT5651_INR_SEL_SFT, rt5651_inr2_src);
-
-static const struct snd_kcontrol_new rt5651_inr2_mux =
-       SOC_DAPM_ENUM("INR2 source", rt5651_inr2_enum);
-
-
 /* Stereo ADC source */
 static const char * const rt5651_stereo1_adc1_src[] = {"DD MIX", "ADC"};
 
@@ -955,11 +917,7 @@ static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = {
                         RT5651_PWR_IN2_L_BIT, 0, NULL, 0),
        SND_SOC_DAPM_PGA("INR2 VOL", RT5651_PWR_VOL,
                         RT5651_PWR_IN2_R_BIT, 0, NULL, 0),
-       /* IN Mux */
-       SND_SOC_DAPM_MUX("INL1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl1_mux),
-       SND_SOC_DAPM_MUX("INR1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr1_mux),
-       SND_SOC_DAPM_MUX("INL2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl2_mux),
-       SND_SOC_DAPM_MUX("INR2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr2_mux),
+
        /* REC Mixer */
        SND_SOC_DAPM_MIXER("RECMIXL", RT5651_PWR_MIXER, RT5651_PWR_RM_L_BIT, 0,
                           rt5651_rec_l_mix, ARRAY_SIZE(rt5651_rec_l_mix)),