Commit 54ac045026d4172a1df21e61adc8e67369d00058
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-dapm
Showing 1 changed file Side-by-side Diff
sound/soc/codecs/rt5640.c
| ... | ... | @@ -737,29 +737,6 @@ |
| 737 | 737 | RT5640_M_BST1_MM_SFT, 1, 1), |
| 738 | 738 | }; |
| 739 | 739 | |
| 740 | -/* INL/R source */ | |
| 741 | -static const char * const rt5640_inl_src[] = { | |
| 742 | - "IN2P", "MONOP" | |
| 743 | -}; | |
| 744 | - | |
| 745 | -static const SOC_ENUM_SINGLE_DECL( | |
| 746 | - rt5640_inl_enum, RT5640_INL_INR_VOL, | |
| 747 | - RT5640_INL_SEL_SFT, rt5640_inl_src); | |
| 748 | - | |
| 749 | -static const struct snd_kcontrol_new rt5640_inl_mux = | |
| 750 | - SOC_DAPM_ENUM("INL source", rt5640_inl_enum); | |
| 751 | - | |
| 752 | -static const char * const rt5640_inr_src[] = { | |
| 753 | - "IN2N", "MONON" | |
| 754 | -}; | |
| 755 | - | |
| 756 | -static const SOC_ENUM_SINGLE_DECL( | |
| 757 | - rt5640_inr_enum, RT5640_INL_INR_VOL, | |
| 758 | - RT5640_INR_SEL_SFT, rt5640_inr_src); | |
| 759 | - | |
| 760 | -static const struct snd_kcontrol_new rt5640_inr_mux = | |
| 761 | - SOC_DAPM_ENUM("INR source", rt5640_inr_enum); | |
| 762 | - | |
| 763 | 740 | /* Stereo ADC source */ |
| 764 | 741 | static const char * const rt5640_stereo_adc1_src[] = { |
| 765 | 742 | "DIG MIX", "ADC" |
| ... | ... | @@ -1005,9 +982,6 @@ |
| 1005 | 982 | RT5640_PWR_IN_L_BIT, 0, NULL, 0), |
| 1006 | 983 | SND_SOC_DAPM_PGA("INR VOL", RT5640_PWR_VOL, |
| 1007 | 984 | RT5640_PWR_IN_R_BIT, 0, NULL, 0), |
| 1008 | - /* IN Mux */ | |
| 1009 | - SND_SOC_DAPM_MUX("INL Mux", SND_SOC_NOPM, 0, 0, &rt5640_inl_mux), | |
| 1010 | - SND_SOC_DAPM_MUX("INR Mux", SND_SOC_NOPM, 0, 0, &rt5640_inr_mux), | |
| 1011 | 985 | /* REC Mixer */ |
| 1012 | 986 | SND_SOC_DAPM_MIXER("RECMIXL", RT5640_PWR_MIXER, RT5640_PWR_RM_L_BIT, 0, |
| 1013 | 987 | rt5640_rec_l_mix, ARRAY_SIZE(rt5640_rec_l_mix)), |