mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <samuel.ortiz@intel.com>,
	Dmitry Torokhov <dtor@mail.ru>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	Misael Lopez Cruz <misael.lopez@ti.com>,
	linux-input@vger.kernel.org
Subject: [PATCH v2 5/6] ASoC: omap-mcpdm: Correct the supported number of channels
Date: Fri, 23 Sep 2011 09:49:43 +0300	[thread overview]
Message-ID: <1316760584-27426-6-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1316760584-27426-1-git-send-email-peter.ujfalusi@ti.com>

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 159a5e9..2c9fa51 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -299,15 +299,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;
@@ -403,13 +405,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


  parent reply	other threads:[~2011-09-23  6:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-23  6:49 [PATCH v2 0/6] ASoC/MFD/Input: twl6040: Support for audio driven vibra Peter Ujfalusi
2011-09-23  6:49 ` [PATCH v2 1/6] Input: twl6040: Simplify vibra regsiter definitions Peter Ujfalusi
2011-09-23  6:49 ` [PATCH v2 2/6] MFD: twl6040: Cache the vibra control registers Peter Ujfalusi
2011-10-10 19:04   ` Samuel Ortiz
2011-10-11 14:48   ` Mark Brown
2011-10-11 16:01     ` Dmitry Torokhov
2011-10-12  8:05       ` Péter Ujfalusi
2011-10-12  7:53     ` Péter Ujfalusi
2011-09-23  6:49 ` [PATCH v2 3/6] MFD: twl6040: function to query the vibra status for clients Peter Ujfalusi
2011-10-10 19:05   ` Samuel Ortiz
2011-10-11  3:49     ` Ujfalusi, Peter
2011-09-23  6:49 ` [PATCH v2 4/6] Input: twl6040-vibra: Check the selected path for vibra Peter Ujfalusi
2011-09-23  6:49 ` Peter Ujfalusi [this message]
2011-09-23 10:52   ` [PATCH v2 5/6] ASoC: omap-mcpdm: Correct the supported number of channels Mark Brown
2011-09-23  6:49 ` [PATCH v2 6/6] ASoC: twl6040: Support for vibra output paths Peter Ujfalusi
2011-10-10 18:36 ` [PATCH v2 0/6] ASoC/MFD/Input: twl6040: Support for audio driven vibra Ujfalusi, Peter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1316760584-27426-6-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=dtor@mail.ru \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=misael.lopez@ti.com \
    --cc=samuel.ortiz@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®