OSDN Git Service

ASoC: wm8960: Remove bitclk relax condition in wm8960_configure_sysclk
authorShengjiu Wang <shengjiu.wang@nxp.com>
Wed, 3 Mar 2021 03:07:42 +0000 (11:07 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 25 Mar 2021 13:59:00 +0000 (13:59 +0000)
commit99067c07e8d877035f6249d194a317c78b7d052d
tree311ee5cd2a0acff27ece5e8eb844ccb20131fb84
parentdf8077c6fe64fe98c1b1c1f9ecf84afc773e726f
ASoC: wm8960: Remove bitclk relax condition in wm8960_configure_sysclk

The call sequence in wm8960_configure_clocking is

   ret = wm8960_configure_sysclk();
   if (ret >= 0)
        goto configure_clock;

   ....

   ret = wm8960_configure_pll();

configure_clock:
   ...

wm8960_configure_sysclk is called before wm8960_configure_pll, as
there is bitclk relax on both functions, so wm8960_configure_sysclk
always return success, then wm8960_configure_pll() never be called.

With this case:
aplay -Dhw:0,0 -d 5 -r 48000 -f S24_LE -c 2 audio48k24b2c.wav
the required bitclk is 48000 * 24 * 2 = 2304000, bitclk got from
wm8960_configure_sysclk is 3072000, but if go to wm8960_configure_pll.
it can get correct bitclk 2304000.

So bitclk relax condition should be removed in wm8960_configure_sysclk,
then wm8960_configure_pll can be called, and there is also bitclk relax
function in wm8960_configure_pll.

Fixes: 3c01b9ee2ab9 ("ASoC: codec: wm8960: Relax bit clock computation")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/1614740862-30196-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8960.c