]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
SAUCE: set correct rates before registering SPDIF codec DAI
authorEric Miao <eric.miao@linaro.org>
Mon, 26 Sep 2011 02:46:27 +0000 (10:46 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:33:14 +0000 (08:33 +0200)
BugLink: http://bugs.launchpad.net/bugs/855281
Playback/capture rates should be configured before the SPDIF codec
DAI is registered, according to the parameters that passed in by
the platform data. And this caused pulseaudio not working with the
SPDIF sound card.

Signed-off-by: Eric Miao <eric.miao@linaro.org>
sound/soc/codecs/mxc_spdif.c

index 6774ed954269964ce6db315ef84239ae546e46bf..fbcd7549420992bbfcfc63b98d620e89e3923502 100644 (file)
@@ -1152,7 +1152,13 @@ static int __devinit mxc_spdif_probe(struct platform_device *pdev)
                mxc_spdif_codec_dai.playback.stream_name = "Playback";
                mxc_spdif_codec_dai.playback.channels_min = 2;
                mxc_spdif_codec_dai.playback.channels_max = 2;
-               mxc_spdif_codec_dai.playback.rates = MXC_SPDIF_RATES_PLAYBACK;
+
+               if (plat_data->spdif_clk_44100 >= 0)
+                       mxc_spdif_codec_dai.playback.rates |= SNDRV_PCM_RATE_44100;
+               if (plat_data->spdif_clk_48000 >= 0)
+                       mxc_spdif_codec_dai.playback.rates |= SNDRV_PCM_RATE_32000 |
+                                                             SNDRV_PCM_RATE_48000;
+
                mxc_spdif_codec_dai.playback.formats = MXC_SPDIF_FORMATS_PLAYBACK;
        }
 
@@ -1160,7 +1166,13 @@ static int __devinit mxc_spdif_probe(struct platform_device *pdev)
                mxc_spdif_codec_dai.capture.stream_name = "Capture";
                mxc_spdif_codec_dai.capture.channels_min = 2;
                mxc_spdif_codec_dai.capture.channels_max = 2;
-               mxc_spdif_codec_dai.capture.rates = MXC_SPDIF_RATES_CAPTURE;
+
+               if (plat_data->spdif_clk_44100 >= 0)
+                       mxc_spdif_codec_dai.capture.rates |= SNDRV_PCM_RATE_44100;
+               if (plat_data->spdif_clk_48000 >= 0)
+                       mxc_spdif_codec_dai.capture.rates |= SNDRV_PCM_RATE_32000 |
+                                                            SNDRV_PCM_RATE_48000;
+
                mxc_spdif_codec_dai.capture.formats = MXC_SPDIF_FORMATS_CAPTURE;
        }