]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: allo-boss-dac: fix S24_LE format
authorMatthias Reichl <hias@horus.com>
Fri, 2 Feb 2018 19:30:42 +0000 (20:30 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 15 Aug 2018 17:23:09 +0000 (19:23 +0200)
Remove set_bclk_ratio call so 24-bit data is transmitted in
24 bclk cycles.

Signed-off-by: Matthias Reichl <hias@horus.com>
(cherry picked from commit d1eaf62648502d24e9b8029d887079eeb3e7d6c4
https://github.com/raspberrypi/linux raspi/rpi-4.15.y)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
sound/soc/bcm/allo-boss-dac.c

index 203ab76c7045b081578e23bda1099dd103d11154..26c37da070176330abddc7d2d689dcbb43bd78c2 100644 (file)
@@ -222,14 +222,6 @@ static int snd_allo_boss_update_rate_den(
        return 0;
 }
 
-static int snd_allo_boss_set_bclk_ratio_pro(
-       struct snd_soc_dai *cpu_dai, struct snd_pcm_hw_params *params)
-{
-       int bratio = snd_pcm_format_physical_width(params_format(params))
-               * params_channels(params);
-       return snd_soc_dai_set_bclk_ratio(cpu_dai, bratio);
-}
-
 static void snd_allo_boss_gpio_mute(struct snd_soc_card *card)
 {
        if (mute_gpio)
@@ -281,9 +273,6 @@ static int snd_allo_boss_hw_params(
 {
        int ret = 0;
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-       unsigned int sample_bits =
-               snd_pcm_format_physical_width(params_format(params));
 
        if (snd_soc_allo_boss_master) {
                struct snd_soc_codec *codec = rtd->codec;
@@ -291,13 +280,8 @@ static int snd_allo_boss_hw_params(
                snd_allo_boss_set_sclk(codec,
                        params_rate(params));
 
-               ret = snd_allo_boss_set_bclk_ratio_pro(cpu_dai,
-                       params);
-               if (!ret)
-                       ret = snd_allo_boss_update_rate_den(
-                               substream, params);
-       } else {
-               ret = snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2);
+               ret = snd_allo_boss_update_rate_den(
+                       substream, params);
        }
        return ret;
 }