lkml.org 
[lkml]   [2011]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/8] ASoC: omap-mcpdm: Correct the supported number of channels
    Date
    OMAP4 McPDM supports 5 downlink (playback), and
    3 uplink (capture) channels.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    ---
    sound/soc/omap/omap-mcpdm.c | 14 ++++++++------
    1 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
    index 23eaacb..41d1706 100644
    --- a/sound/soc/omap/omap-mcpdm.c
    +++ b/sound/soc/omap/omap-mcpdm.c
    @@ -315,15 +315,17 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,

    channels = params_channels(params);
    switch (channels) {
    + case 5:
    + if (stream == SNDRV_PCM_STREAM_CAPTURE)
    + /* up to 3 channels for capture */
    + return -EINVAL;
    + link_mask |= 1 << 4;
    case 4:
    if (stream == SNDRV_PCM_STREAM_CAPTURE)
    - /* up to 2 channels for capture */
    + /* up to 3 channels for capture */
    return -EINVAL;
    link_mask |= 1 << 3;
    case 3:
    - if (stream == SNDRV_PCM_STREAM_CAPTURE)
    - /* up to 2 channels for capture */
    - return -EINVAL;
    link_mask |= 1 << 2;
    case 2:
    link_mask |= 1 << 1;
    @@ -419,13 +421,13 @@ static struct snd_soc_dai_driver omap_mcpdm_dai = {
    .remove_order = SND_SOC_COMP_ORDER_EARLY,
    .playback = {
    .channels_min = 1,
    - .channels_max = 4,
    + .channels_max = 5,
    .rates = OMAP_MCPDM_RATES,
    .formats = OMAP_MCPDM_FORMATS,
    },
    .capture = {
    .channels_min = 1,
    - .channels_max = 2,
    + .channels_max = 3,
    .rates = OMAP_MCPDM_RATES,
    .formats = OMAP_MCPDM_FORMATS,
    },
    --
    1.7.6.1


    \
     
     \ /
      Last update: 2011-09-15 15:03    [W:0.029 / U:0.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site