Merge branch 'fix/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/davinci/davinci-evm.c
Simple merge

diff --cc sound/soc/davinci/davinci-mcasp.c
index ae328be,670afa2..f662ef2
--- 1/sound/soc/davinci/davinci-mcasp.c
--- 2/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@@ -613,20 -604,9 +612,21 @@@ static int davinci_mcasp_hw_params(stru
        u8 slots = mcasp->tdm_slots;
        u8 active_serializers;
        int channels;
+       int ret;
        struct snd_interval *pcm_channels = hw_param_interval(params,
                                        SNDRV_PCM_HW_PARAM_CHANNELS);
 +
 +      /* If mcasp is BCLK master we need to set BCLK divider */
 +      if (mcasp->bclk_master) {
 +              unsigned int bclk_freq = snd_soc_params_to_bclk(params);
 +              if (mcasp->sysclk_freq % bclk_freq != 0) {
 +                      dev_err(mcasp->dev, "Can't produce requred BCLK\n");
 +                      return -EINVAL;
 +              }
 +              davinci_mcasp_set_clkdiv(
 +                      cpu_dai, 1, mcasp->sysclk_freq / bclk_freq);
 +      }
 +
        channels = pcm_channels->min;
  
        active_serializers = (channels + slots - 1) / slots;