diff options
Diffstat (limited to 'sound/soc/codecs/cs47l24.c')
-rw-r--r-- | sound/soc/codecs/cs47l24.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c index 954a4f5d3338..5b22564f037c 100644 --- a/sound/soc/codecs/cs47l24.c +++ b/sound/soc/codecs/cs47l24.c | |||
@@ -746,6 +746,16 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { | |||
746 | { "IN2L", NULL, "SYSCLK" }, | 746 | { "IN2L", NULL, "SYSCLK" }, |
747 | { "IN2R", NULL, "SYSCLK" }, | 747 | { "IN2R", NULL, "SYSCLK" }, |
748 | 748 | ||
749 | { "ASRC1L", NULL, "SYSCLK" }, | ||
750 | { "ASRC1R", NULL, "SYSCLK" }, | ||
751 | { "ASRC2L", NULL, "SYSCLK" }, | ||
752 | { "ASRC2R", NULL, "SYSCLK" }, | ||
753 | |||
754 | { "ASRC1L", NULL, "ASYNCCLK" }, | ||
755 | { "ASRC1R", NULL, "ASYNCCLK" }, | ||
756 | { "ASRC2L", NULL, "ASYNCCLK" }, | ||
757 | { "ASRC2R", NULL, "ASYNCCLK" }, | ||
758 | |||
749 | { "MICBIAS1", NULL, "MICVDD" }, | 759 | { "MICBIAS1", NULL, "MICVDD" }, |
750 | { "MICBIAS2", NULL, "MICVDD" }, | 760 | { "MICBIAS2", NULL, "MICVDD" }, |
751 | 761 | ||
@@ -804,7 +814,6 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { | |||
804 | { "AIF3 Capture", NULL, "SYSCLK" }, | 814 | { "AIF3 Capture", NULL, "SYSCLK" }, |
805 | 815 | ||
806 | { "Voice Control DSP", NULL, "DSP3" }, | 816 | { "Voice Control DSP", NULL, "DSP3" }, |
807 | { "Voice Control DSP", NULL, "SYSCLK" }, | ||
808 | 817 | ||
809 | { "IN1L PGA", NULL, "IN1L" }, | 818 | { "IN1L PGA", NULL, "IN1L" }, |
810 | { "IN1R PGA", NULL, "IN1R" }, | 819 | { "IN1R PGA", NULL, "IN1R" }, |
@@ -813,7 +822,6 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { | |||
813 | { "IN2R PGA", NULL, "IN2R" }, | 822 | { "IN2R PGA", NULL, "IN2R" }, |
814 | 823 | ||
815 | { "Audio Trace DSP", NULL, "DSP2" }, | 824 | { "Audio Trace DSP", NULL, "DSP2" }, |
816 | { "Audio Trace DSP", NULL, "SYSCLK" }, | ||
817 | 825 | ||
818 | ARIZONA_MIXER_ROUTES("OUT1L", "HPOUT1L"), | 826 | ARIZONA_MIXER_ROUTES("OUT1L", "HPOUT1L"), |
819 | ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"), | 827 | ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"), |
@@ -1190,12 +1198,14 @@ static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = { | |||
1190 | .set_sysclk = arizona_set_sysclk, | 1198 | .set_sysclk = arizona_set_sysclk, |
1191 | .set_pll = cs47l24_set_fll, | 1199 | .set_pll = cs47l24_set_fll, |
1192 | 1200 | ||
1193 | .controls = cs47l24_snd_controls, | 1201 | .component_driver = { |
1194 | .num_controls = ARRAY_SIZE(cs47l24_snd_controls), | 1202 | .controls = cs47l24_snd_controls, |
1195 | .dapm_widgets = cs47l24_dapm_widgets, | 1203 | .num_controls = ARRAY_SIZE(cs47l24_snd_controls), |
1196 | .num_dapm_widgets = ARRAY_SIZE(cs47l24_dapm_widgets), | 1204 | .dapm_widgets = cs47l24_dapm_widgets, |
1197 | .dapm_routes = cs47l24_dapm_routes, | 1205 | .num_dapm_widgets = ARRAY_SIZE(cs47l24_dapm_widgets), |
1198 | .num_dapm_routes = ARRAY_SIZE(cs47l24_dapm_routes), | 1206 | .dapm_routes = cs47l24_dapm_routes, |
1207 | .num_dapm_routes = ARRAY_SIZE(cs47l24_dapm_routes), | ||
1208 | }, | ||
1199 | }; | 1209 | }; |
1200 | 1210 | ||
1201 | static struct snd_compr_ops cs47l24_compr_ops = { | 1211 | static struct snd_compr_ops cs47l24_compr_ops = { |