diff options
Diffstat (limited to 'sound/soc/pxa/pxa-ssp.c')
-rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index d11a6d7e384a..3bd7712f029b 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -305,8 +305,8 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai, | |||
305 | /* | 305 | /* |
306 | * Configure the PLL frequency pxa27x and (afaik - pxa320 only) | 306 | * Configure the PLL frequency pxa27x and (afaik - pxa320 only) |
307 | */ | 307 | */ |
308 | static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, | 308 | static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id, |
309 | int pll_id, unsigned int freq_in, unsigned int freq_out) | 309 | int source, unsigned int freq_in, unsigned int freq_out) |
310 | { | 310 | { |
311 | struct ssp_priv *priv = cpu_dai->private_data; | 311 | struct ssp_priv *priv = cpu_dai->private_data; |
312 | struct ssp_device *ssp = priv->dev.ssp; | 312 | struct ssp_device *ssp = priv->dev.ssp; |
@@ -760,13 +760,13 @@ struct snd_soc_dai pxa_ssp_dai[] = { | |||
760 | .resume = pxa_ssp_resume, | 760 | .resume = pxa_ssp_resume, |
761 | .playback = { | 761 | .playback = { |
762 | .channels_min = 1, | 762 | .channels_min = 1, |
763 | .channels_max = 2, | 763 | .channels_max = 8, |
764 | .rates = PXA_SSP_RATES, | 764 | .rates = PXA_SSP_RATES, |
765 | .formats = PXA_SSP_FORMATS, | 765 | .formats = PXA_SSP_FORMATS, |
766 | }, | 766 | }, |
767 | .capture = { | 767 | .capture = { |
768 | .channels_min = 1, | 768 | .channels_min = 1, |
769 | .channels_max = 2, | 769 | .channels_max = 8, |
770 | .rates = PXA_SSP_RATES, | 770 | .rates = PXA_SSP_RATES, |
771 | .formats = PXA_SSP_FORMATS, | 771 | .formats = PXA_SSP_FORMATS, |
772 | }, | 772 | }, |
@@ -780,13 +780,13 @@ struct snd_soc_dai pxa_ssp_dai[] = { | |||
780 | .resume = pxa_ssp_resume, | 780 | .resume = pxa_ssp_resume, |
781 | .playback = { | 781 | .playback = { |
782 | .channels_min = 1, | 782 | .channels_min = 1, |
783 | .channels_max = 2, | 783 | .channels_max = 8, |
784 | .rates = PXA_SSP_RATES, | 784 | .rates = PXA_SSP_RATES, |
785 | .formats = PXA_SSP_FORMATS, | 785 | .formats = PXA_SSP_FORMATS, |
786 | }, | 786 | }, |
787 | .capture = { | 787 | .capture = { |
788 | .channels_min = 1, | 788 | .channels_min = 1, |
789 | .channels_max = 2, | 789 | .channels_max = 8, |
790 | .rates = PXA_SSP_RATES, | 790 | .rates = PXA_SSP_RATES, |
791 | .formats = PXA_SSP_FORMATS, | 791 | .formats = PXA_SSP_FORMATS, |
792 | }, | 792 | }, |
@@ -801,13 +801,13 @@ struct snd_soc_dai pxa_ssp_dai[] = { | |||
801 | .resume = pxa_ssp_resume, | 801 | .resume = pxa_ssp_resume, |
802 | .playback = { | 802 | .playback = { |
803 | .channels_min = 1, | 803 | .channels_min = 1, |
804 | .channels_max = 2, | 804 | .channels_max = 8, |
805 | .rates = PXA_SSP_RATES, | 805 | .rates = PXA_SSP_RATES, |
806 | .formats = PXA_SSP_FORMATS, | 806 | .formats = PXA_SSP_FORMATS, |
807 | }, | 807 | }, |
808 | .capture = { | 808 | .capture = { |
809 | .channels_min = 1, | 809 | .channels_min = 1, |
810 | .channels_max = 2, | 810 | .channels_max = 8, |
811 | .rates = PXA_SSP_RATES, | 811 | .rates = PXA_SSP_RATES, |
812 | .formats = PXA_SSP_FORMATS, | 812 | .formats = PXA_SSP_FORMATS, |
813 | }, | 813 | }, |
@@ -822,13 +822,13 @@ struct snd_soc_dai pxa_ssp_dai[] = { | |||
822 | .resume = pxa_ssp_resume, | 822 | .resume = pxa_ssp_resume, |
823 | .playback = { | 823 | .playback = { |
824 | .channels_min = 1, | 824 | .channels_min = 1, |
825 | .channels_max = 2, | 825 | .channels_max = 8, |
826 | .rates = PXA_SSP_RATES, | 826 | .rates = PXA_SSP_RATES, |
827 | .formats = PXA_SSP_FORMATS, | 827 | .formats = PXA_SSP_FORMATS, |
828 | }, | 828 | }, |
829 | .capture = { | 829 | .capture = { |
830 | .channels_min = 1, | 830 | .channels_min = 1, |
831 | .channels_max = 2, | 831 | .channels_max = 8, |
832 | .rates = PXA_SSP_RATES, | 832 | .rates = PXA_SSP_RATES, |
833 | .formats = PXA_SSP_FORMATS, | 833 | .formats = PXA_SSP_FORMATS, |
834 | }, | 834 | }, |