diff options
| -rw-r--r-- | sound/soc/codecs/rt5677.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 66abfa3bbb95..cf39fe6d0601 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c | |||
| @@ -3014,8 +3014,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { | |||
| 3014 | 3014 | ||
| 3015 | { "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" }, | 3015 | { "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" }, |
| 3016 | { "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" }, | 3016 | { "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" }, |
| 3017 | { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3018 | |||
| 3019 | { "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" }, | 3017 | { "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" }, |
| 3020 | { "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" }, | 3018 | { "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" }, |
| 3021 | { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll }, | 3019 | { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll }, |
| @@ -3036,8 +3034,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { | |||
| 3036 | 3034 | ||
| 3037 | { "Stereo2 ADC MIXL", NULL, "Stereo2 ADC LR Mux" }, | 3035 | { "Stereo2 ADC MIXL", NULL, "Stereo2 ADC LR Mux" }, |
| 3038 | { "Stereo2 ADC MIXL", NULL, "adc stereo2 filter" }, | 3036 | { "Stereo2 ADC MIXL", NULL, "adc stereo2 filter" }, |
| 3039 | { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3040 | |||
| 3041 | { "Stereo2 ADC MIXR", NULL, "Sto2 ADC MIXR" }, | 3037 | { "Stereo2 ADC MIXR", NULL, "Sto2 ADC MIXR" }, |
| 3042 | { "Stereo2 ADC MIXR", NULL, "adc stereo2 filter" }, | 3038 | { "Stereo2 ADC MIXR", NULL, "adc stereo2 filter" }, |
| 3043 | { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll }, | 3039 | { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll }, |
| @@ -3052,8 +3048,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { | |||
| 3052 | 3048 | ||
| 3053 | { "Stereo3 ADC MIXL", NULL, "Sto3 ADC MIXL" }, | 3049 | { "Stereo3 ADC MIXL", NULL, "Sto3 ADC MIXL" }, |
| 3054 | { "Stereo3 ADC MIXL", NULL, "adc stereo3 filter" }, | 3050 | { "Stereo3 ADC MIXL", NULL, "adc stereo3 filter" }, |
| 3055 | { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3056 | |||
| 3057 | { "Stereo3 ADC MIXR", NULL, "Sto3 ADC MIXR" }, | 3051 | { "Stereo3 ADC MIXR", NULL, "Sto3 ADC MIXR" }, |
| 3058 | { "Stereo3 ADC MIXR", NULL, "adc stereo3 filter" }, | 3052 | { "Stereo3 ADC MIXR", NULL, "adc stereo3 filter" }, |
| 3059 | { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll }, | 3053 | { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll }, |
| @@ -3068,8 +3062,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { | |||
| 3068 | 3062 | ||
| 3069 | { "Stereo4 ADC MIXL", NULL, "Sto4 ADC MIXL" }, | 3063 | { "Stereo4 ADC MIXL", NULL, "Sto4 ADC MIXL" }, |
| 3070 | { "Stereo4 ADC MIXL", NULL, "adc stereo4 filter" }, | 3064 | { "Stereo4 ADC MIXL", NULL, "adc stereo4 filter" }, |
| 3071 | { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3072 | |||
| 3073 | { "Stereo4 ADC MIXR", NULL, "Sto4 ADC MIXR" }, | 3065 | { "Stereo4 ADC MIXR", NULL, "Sto4 ADC MIXR" }, |
| 3074 | { "Stereo4 ADC MIXR", NULL, "adc stereo4 filter" }, | 3066 | { "Stereo4 ADC MIXR", NULL, "adc stereo4 filter" }, |
| 3075 | { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll }, | 3067 | { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll }, |
| @@ -3686,39 +3678,46 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { | |||
| 3686 | { "Stereo DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" }, | 3678 | { "Stereo DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" }, |
| 3687 | { "Stereo DAC MIXR", "DAC1 L Switch", "DAC1 MIXL" }, | 3679 | { "Stereo DAC MIXR", "DAC1 L Switch", "DAC1 MIXL" }, |
| 3688 | { "Stereo DAC MIXR", NULL, "dac stereo1 filter" }, | 3680 | { "Stereo DAC MIXR", NULL, "dac stereo1 filter" }, |
| 3681 | { "dac stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3689 | 3682 | ||
| 3690 | { "Mono DAC MIXL", "ST L Switch", "Sidetone Mux" }, | 3683 | { "Mono DAC MIXL", "ST L Switch", "Sidetone Mux" }, |
| 3691 | { "Mono DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" }, | 3684 | { "Mono DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" }, |
| 3692 | { "Mono DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" }, | 3685 | { "Mono DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" }, |
| 3693 | { "Mono DAC MIXL", "DAC2 R Switch", "DAC2 R Mux" }, | 3686 | { "Mono DAC MIXL", "DAC2 R Switch", "DAC2 R Mux" }, |
| 3694 | { "Mono DAC MIXL", NULL, "dac mono2 left filter" }, | 3687 | { "Mono DAC MIXL", NULL, "dac mono2 left filter" }, |
| 3688 | { "dac mono2 left filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3695 | { "Mono DAC MIXR", "ST R Switch", "Sidetone Mux" }, | 3689 | { "Mono DAC MIXR", "ST R Switch", "Sidetone Mux" }, |
| 3696 | { "Mono DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" }, | 3690 | { "Mono DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" }, |
| 3697 | { "Mono DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" }, | 3691 | { "Mono DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" }, |
| 3698 | { "Mono DAC MIXR", "DAC2 L Switch", "DAC2 L Mux" }, | 3692 | { "Mono DAC MIXR", "DAC2 L Switch", "DAC2 L Mux" }, |
| 3699 | { "Mono DAC MIXR", NULL, "dac mono2 right filter" }, | 3693 | { "Mono DAC MIXR", NULL, "dac mono2 right filter" }, |
| 3694 | { "dac mono2 right filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3700 | 3695 | ||
| 3701 | { "DD1 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" }, | 3696 | { "DD1 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" }, |
| 3702 | { "DD1 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" }, | 3697 | { "DD1 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" }, |
| 3703 | { "DD1 MIXL", "DAC3 L Switch", "DAC3 L Mux" }, | 3698 | { "DD1 MIXL", "DAC3 L Switch", "DAC3 L Mux" }, |
| 3704 | { "DD1 MIXL", "DAC3 R Switch", "DAC3 R Mux" }, | 3699 | { "DD1 MIXL", "DAC3 R Switch", "DAC3 R Mux" }, |
| 3705 | { "DD1 MIXL", NULL, "dac mono3 left filter" }, | 3700 | { "DD1 MIXL", NULL, "dac mono3 left filter" }, |
| 3701 | { "dac mono3 left filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3706 | { "DD1 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" }, | 3702 | { "DD1 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" }, |
| 3707 | { "DD1 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" }, | 3703 | { "DD1 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" }, |
| 3708 | { "DD1 MIXR", "DAC3 L Switch", "DAC3 L Mux" }, | 3704 | { "DD1 MIXR", "DAC3 L Switch", "DAC3 L Mux" }, |
| 3709 | { "DD1 MIXR", "DAC3 R Switch", "DAC3 R Mux" }, | 3705 | { "DD1 MIXR", "DAC3 R Switch", "DAC3 R Mux" }, |
| 3710 | { "DD1 MIXR", NULL, "dac mono3 right filter" }, | 3706 | { "DD1 MIXR", NULL, "dac mono3 right filter" }, |
| 3707 | { "dac mono3 right filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3711 | 3708 | ||
| 3712 | { "DD2 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" }, | 3709 | { "DD2 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" }, |
| 3713 | { "DD2 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" }, | 3710 | { "DD2 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" }, |
| 3714 | { "DD2 MIXL", "DAC4 L Switch", "DAC4 L Mux" }, | 3711 | { "DD2 MIXL", "DAC4 L Switch", "DAC4 L Mux" }, |
| 3715 | { "DD2 MIXL", "DAC4 R Switch", "DAC4 R Mux" }, | 3712 | { "DD2 MIXL", "DAC4 R Switch", "DAC4 R Mux" }, |
| 3716 | { "DD2 MIXL", NULL, "dac mono4 left filter" }, | 3713 | { "DD2 MIXL", NULL, "dac mono4 left filter" }, |
| 3714 | { "dac mono4 left filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3717 | { "DD2 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" }, | 3715 | { "DD2 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" }, |
| 3718 | { "DD2 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" }, | 3716 | { "DD2 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" }, |
| 3719 | { "DD2 MIXR", "DAC4 L Switch", "DAC4 L Mux" }, | 3717 | { "DD2 MIXR", "DAC4 L Switch", "DAC4 L Mux" }, |
| 3720 | { "DD2 MIXR", "DAC4 R Switch", "DAC4 R Mux" }, | 3718 | { "DD2 MIXR", "DAC4 R Switch", "DAC4 R Mux" }, |
| 3721 | { "DD2 MIXR", NULL, "dac mono4 right filter" }, | 3719 | { "DD2 MIXR", NULL, "dac mono4 right filter" }, |
| 3720 | { "dac mono4 right filter", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3722 | 3721 | ||
| 3723 | { "Stereo DAC MIX", NULL, "Stereo DAC MIXL" }, | 3722 | { "Stereo DAC MIX", NULL, "Stereo DAC MIXL" }, |
| 3724 | { "Stereo DAC MIX", NULL, "Stereo DAC MIXR" }, | 3723 | { "Stereo DAC MIX", NULL, "Stereo DAC MIXR" }, |
| @@ -3740,11 +3739,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { | |||
| 3740 | { "DAC3 SRC Mux", "DD MIX2L", "DD2 MIXL" }, | 3739 | { "DAC3 SRC Mux", "DD MIX2L", "DD2 MIXL" }, |
| 3741 | 3740 | ||
| 3742 | { "DAC 1", NULL, "DAC12 SRC Mux" }, | 3741 | { "DAC 1", NULL, "DAC12 SRC Mux" }, |
| 3743 | { "DAC 1", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3744 | { "DAC 2", NULL, "DAC12 SRC Mux" }, | 3742 | { "DAC 2", NULL, "DAC12 SRC Mux" }, |
| 3745 | { "DAC 2", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3746 | { "DAC 3", NULL, "DAC3 SRC Mux" }, | 3743 | { "DAC 3", NULL, "DAC3 SRC Mux" }, |
| 3747 | { "DAC 3", NULL, "PLL1", is_sys_clk_from_pll }, | ||
| 3748 | 3744 | ||
| 3749 | { "PDM1 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" }, | 3745 | { "PDM1 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" }, |
| 3750 | { "PDM1 L Mux", "MONO DAC MIX", "Mono DAC MIXL" }, | 3746 | { "PDM1 L Mux", "MONO DAC MIX", "Mono DAC MIXL" }, |
