Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound update from Takashi Iwai:
 "This is the second updates for 3.5-rc1.  It's mainly for OMAP4 HDMI
  updates and the device tree updates for OMAP, in addition to a couple
  of PCM accuray improvement and Realtek ALC269VD codec support."

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek - Add new codec support for ALC269VD
  ALSA: core: group read of pointer, tstamp and jiffies
  ASoC: OMAP: HDMI: Rename sound card source file
  ASoC: OMAP: HDMI: Make sound card naming more generic
  ASoC: OMAP: HDMI: Make build config options more generic
  ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI
  ASoC: OMAP: HDMI: Improve how the display state is verified
  ASoC: OMAP: HDMI: Expand configuration of hw_params
  ASoC: OMAP: HDMI: Use the DSS audio interface
  ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI
  ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI
  ASoC: OMAP: HDMI: Update the platform device names
  ASoC: omap-abe-twl6040: Introduce driver data for runtime parameters
  ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table
  ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structure
  ASoC: omap-dmic: Add device tree bindings
  ASoC: omap-mcpdm: Add device tree bindings
  ASoC: omap-mcbsp: buffer size constraint only applies to playback stream
  ASoC: omap-mcbsp: Use the common interrupt line if supported by the SoC
  ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode
  ...

1 files changed, 25 insertions, 20 deletions

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 6912ac7cb62..1046083e90a 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -71,18 +71,17 @@ static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream)
 
         dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
-        /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
-        if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD)
-                /*
-                 * Configure McBSP threshold based on either:
-                 * packet_size, when the sDMA is in packet mode, or
-                 * based on the period size.
-                 */
-                if (dma_data->packet_size)
-                        words = dma_data->packet_size;
-                else
-                        words = snd_pcm_lib_period_bytes(substream) /
-                                                        (mcbsp->wlen / 8);
+        /*
+         * Configure McBSP threshold based on either:
+         * packet_size, when the sDMA is in packet mode, or based on the
+         * period size in THRESHOLD mode, otherwise use McBSP threshold = 1
+         * for mono streams.
+         */
+        if (dma_data->packet_size)
+                words = dma_data->packet_size;
+        else if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD)
+                words = snd_pcm_lib_period_bytes(substream) /
+                                                (mcbsp->wlen / 8);
         else
                 words = 1;
 
@@ -139,13 +138,15 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
         if (mcbsp->pdata->buffer_size) {
                 /*
                 * Rule for the buffer size. We should not allow
-                * smaller buffer than the FIFO size to avoid underruns
+                * smaller buffer than the FIFO size to avoid underruns.
+                * This applies only for the playback stream.
                 */
-                snd_pcm_hw_rule_add(substream->runtime, 0,
-                                    SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-                                    omap_mcbsp_hwrule_min_buffersize,
-                                    mcbsp,
-                                    SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        snd_pcm_hw_rule_add(substream->runtime, 0,
+                                            SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                            omap_mcbsp_hwrule_min_buffersize,
+                                            mcbsp,
+                                            SNDRV_PCM_HW_PARAM_CHANNELS, -1);
 
                 /* Make sure, that the period size is always even */
                 snd_pcm_hw_constraint_step(substream->runtime, 0,
@@ -230,6 +231,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         unsigned int format, div, framesize, master;
 
         dma_data = &mcbsp->dma_data[substream->stream];
+        channels = params_channels(params);
 
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
@@ -245,7 +247,6 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         }
         if (mcbsp->pdata->buffer_size) {
                 dma_data->set_threshold = omap_mcbsp_set_threshold;
-                /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
                 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
                         int period_words, max_thrsh;
 
@@ -283,6 +284,10 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                         } else {
                                 sync_mode = OMAP_DMA_SYNC_FRAME;
                         }
+                } else if (channels > 1) {
+                        /* Use packet mode for non mono streams */
+                        pkt_size = channels;
+                        sync_mode = OMAP_DMA_SYNC_PACKET;
                 }
         }
 
@@ -301,7 +306,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         regs->rcr1      &= ~(RFRLEN1(0x7f) | RWDLEN1(7));
         regs->xcr1      &= ~(XFRLEN1(0x7f) | XWDLEN1(7));
         format = mcbsp->fmt & SND_SOC_DAIFMT_FORMAT_MASK;
-        wpf = channels = params_channels(params);
+        wpf = channels;
         if (channels == 2 && (format == SND_SOC_DAIFMT_I2S ||
                               format == SND_SOC_DAIFMT_LEFT_J)) {
                 /* Use dual-phase frames */