Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732...

diff --cc sound/soc/fsl/fsl_ssi.c
index b9fabbf69db6c9830ebf0de211f62735a24297b8,2595611e8a6ded3876345767bde2ce51e079c9ee,2595611e8a6ded3876345767bde2ce51e079c9ee,2595611e8a6ded3876345767bde2ce51e079c9ee,7eebc0889c9d3aecd59eea5aa1569352d5e37f74,2595611e8a6ded3876345767bde2ce51e079c9ee,2595611e8a6ded3876345767bde2ce51e079c9ee..6b0c8f717ec2c0781af066cfb1bc3bcce8567791
--- 1/sound/soc/fsl/fsl_ssi.c
--- 2/sound/soc/fsl/fsl_ssi.c
--- 3/sound/soc/fsl/fsl_ssi.c
--- 4/sound/soc/fsl/fsl_ssi.c
--- 5/sound/soc/fsl/fsl_ssi.c
--- 6/sound/soc/fsl/fsl_ssi.c
--- 7/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@@@@@@@ -603,7 -603,11 -603,11 -603,11 -603,7 -603,11 -603,11 +603,7 @@@@@@@@ static int fsl_ssi_set_bclk(struct snd_
        factor = (div2 + 1) * (7 * psr + 1) * 2;
       
        for (i = 0; i < 255; i++) {
 --- --         /* The bclk rate must be smaller than 1/5 sysclk rate */
 --- --         if (factor * (i + 1) < 5)
 --- --                 continue;
 --- --
---- --         tmprate = freq * factor * (i + 2);
++++ ++         tmprate = freq * factor * (i + 1);
       
                if (baudclk_is_used)
                        clkrate = clk_get_rate(ssi_private->baudclk);