Merge remote-tracking branch 'asoc/fix/davinci' into asoc-davinci

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index bfcc6c3dc2fde18ad0f5165f4a1bc3ede68984b1..f7dc538679b1d357dc4570df2aeb098cc9696360 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -27,6 +27,7 @@
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
 
+#include <sound/asoundef.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -637,8 +638,12 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream)
 }
 
 /* S/PDIF */
-static int mcasp_dit_hw_param(struct davinci_mcasp *mcasp)
+static int mcasp_dit_hw_param(struct davinci_mcasp *mcasp,
+                             unsigned int rate)
 {
+       u32 cs_value = 0;
+       u8 *cs_bytes = (u8*) &cs_value;
+
        /* Set the TX format : 24 bit right rotation, 32 bit slot, Pad 0
           and LSB first */
        mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMT_REG, TXROT(6) | TXSSZ(15));
@@ -660,6 +665,46 @@ static int mcasp_dit_hw_param(struct davinci_mcasp *mcasp)
        /* Enable the DIT */
        mcasp_set_bits(mcasp, DAVINCI_MCASP_TXDITCTL_REG, DITEN);
 
+       /* Set S/PDIF channel status bits */
+       cs_bytes[0] = IEC958_AES0_CON_NOT_COPYRIGHT;
+       cs_bytes[1] = IEC958_AES1_CON_PCM_CODER;
+
+       switch (rate) {
+       case 22050:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_22050;
+               break;
+       case 24000:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_24000;
+               break;
+       case 32000:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_32000;
+               break;
+       case 44100:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_44100;
+               break;
+       case 48000:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_48000;
+               break;
+       case 88200:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_88200;
+               break;
+       case 96000:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_96000;
+               break;
+       case 176400:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_176400;
+               break;
+       case 192000:
+               cs_bytes[3] |= IEC958_AES3_CON_FS_192000;
+               break;
+       default:
+               printk(KERN_WARNING "unsupported sampling rate: %d\n", rate);
+               return -EINVAL;
+       }
+
+       mcasp_set_reg(mcasp, DAVINCI_MCASP_DITCSRA_REG, cs_value);
+       mcasp_set_reg(mcasp, DAVINCI_MCASP_DITCSRB_REG, cs_value);
+
        return 0;
 }
 
@@ -676,14 +721,18 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
        int ret;
 
        /* If mcasp is BCLK master we need to set BCLK divider */
-       if (mcasp->bclk_master) {
+       if (mcasp->bclk_master && mcasp->sysclk_freq) {
                unsigned int bclk_freq = snd_soc_params_to_bclk(params);
+               unsigned int div = mcasp->sysclk_freq / bclk_freq;
                if (mcasp->sysclk_freq % bclk_freq != 0) {
-                       dev_err(mcasp->dev, "Can't produce required BCLK\n");
-                       return -EINVAL;
+                       if (((mcasp->sysclk_freq / div) - bclk_freq) >
+                           (bclk_freq - (mcasp->sysclk_freq / (div+1))))
+                               div++;
+                       dev_warn(mcasp->dev,
+                                "Inaccurate BCLK: %u Hz / %u != %u Hz\n",
+                                mcasp->sysclk_freq, div, bclk_freq);
                }
-               davinci_mcasp_set_clkdiv(
-                       cpu_dai, 1, mcasp->sysclk_freq / bclk_freq);
+               davinci_mcasp_set_clkdiv(cpu_dai, 1, div);
        }
 
        ret = mcasp_common_hw_param(mcasp, substream->stream,
@@ -692,7 +741,7 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
                return ret;
 
        if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE)
-               ret = mcasp_dit_hw_param(mcasp);
+               ret = mcasp_dit_hw_param(mcasp, params_rate(params));
        else
                ret = mcasp_i2s_hw_param(mcasp, substream->stream);