diff options
author | Bard Liao <bardliao@realtek.com> | 2015-03-12 22:50:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-13 07:13:16 -0400 |
commit | b52551e0d0e659db43f5cfa813ae09d4c3744761 (patch) | |
tree | a14fc629b1862fe73aa0046a9e014af0a1abd096 /sound/soc/codecs | |
parent | 42ce5b8ab81e94089c79791fc682a7f46af9790a (diff) |
ASoC: rt5645: Remove adc stereo2 filter
Remove adc stereo2 filter since it is not in rt5645/rt5650 codec.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/rt5645.c | 3 | ||||
-rw-r--r-- | sound/soc/codecs/rt5645.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index b79347688873..4c384a14de1d 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c | |||
@@ -1538,8 +1538,6 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = { | |||
1538 | 1538 | ||
1539 | SND_SOC_DAPM_SUPPLY_S("adc stereo1 filter", 1, RT5645_PWR_DIG2, | 1539 | SND_SOC_DAPM_SUPPLY_S("adc stereo1 filter", 1, RT5645_PWR_DIG2, |
1540 | RT5645_PWR_ADC_S1F_BIT, 0, NULL, 0), | 1540 | RT5645_PWR_ADC_S1F_BIT, 0, NULL, 0), |
1541 | SND_SOC_DAPM_SUPPLY_S("adc stereo2 filter", 1, RT5645_PWR_DIG2, | ||
1542 | RT5645_PWR_ADC_S2F_BIT, 0, NULL, 0), | ||
1543 | SND_SOC_DAPM_MIXER_E("Sto1 ADC MIXL", SND_SOC_NOPM, 0, 0, | 1541 | SND_SOC_DAPM_MIXER_E("Sto1 ADC MIXL", SND_SOC_NOPM, 0, 0, |
1544 | rt5645_sto1_adc_l_mix, ARRAY_SIZE(rt5645_sto1_adc_l_mix), | 1542 | rt5645_sto1_adc_l_mix, ARRAY_SIZE(rt5645_sto1_adc_l_mix), |
1545 | NULL, 0), | 1543 | NULL, 0), |
@@ -1729,7 +1727,6 @@ static const struct snd_soc_dapm_widget rt5650_specific_dapm_widgets[] = { | |||
1729 | 1727 | ||
1730 | static const struct snd_soc_dapm_route rt5645_dapm_routes[] = { | 1728 | static const struct snd_soc_dapm_route rt5645_dapm_routes[] = { |
1731 | { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc }, | 1729 | { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc }, |
1732 | { "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc }, | ||
1733 | { "adc mono left filter", NULL, "ADC MONO L ASRC", is_using_asrc }, | 1730 | { "adc mono left filter", NULL, "ADC MONO L ASRC", is_using_asrc }, |
1734 | { "adc mono right filter", NULL, "ADC MONO R ASRC", is_using_asrc }, | 1731 | { "adc mono right filter", NULL, "ADC MONO R ASRC", is_using_asrc }, |
1735 | { "dac mono left filter", NULL, "DAC MONO L ASRC", is_using_asrc }, | 1732 | { "dac mono left filter", NULL, "DAC MONO L ASRC", is_using_asrc }, |
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index dbfd98c22f4d..db78e9462876 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h | |||
@@ -804,8 +804,6 @@ | |||
804 | #define RT5645_PWR_DAC_MF_L_BIT 10 | 804 | #define RT5645_PWR_DAC_MF_L_BIT 10 |
805 | #define RT5645_PWR_DAC_MF_R (0x1 << 9) | 805 | #define RT5645_PWR_DAC_MF_R (0x1 << 9) |
806 | #define RT5645_PWR_DAC_MF_R_BIT 9 | 806 | #define RT5645_PWR_DAC_MF_R_BIT 9 |
807 | #define RT5645_PWR_ADC_S2F (0x1 << 8) | ||
808 | #define RT5645_PWR_ADC_S2F_BIT 8 | ||
809 | #define RT5645_PWR_PDM1 (0x1 << 7) | 807 | #define RT5645_PWR_PDM1 (0x1 << 7) |
810 | #define RT5645_PWR_PDM1_BIT 7 | 808 | #define RT5645_PWR_PDM1_BIT 7 |
811 | #define RT5645_PWR_PDM2 (0x1 << 6) | 809 | #define RT5645_PWR_PDM2 (0x1 << 6) |