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 7/8] ASoC: omap-mcpdm: Correct the supported number of channels
Date: Thu, 15 Sep 2011 15:59:20 +0300 [thread overview]
Message-ID: <1316091561-30899-8-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1316091561-30899-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 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
next prev parent reply other threads:[~2011-09-15 13:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 12:59 [PATCH 0/8] ASoC/MFD/Input: twl6040: Support for audio driven vibra Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 1/8] Input: twl6040: Simplify vibra regsiter definitions Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 2/8] MFD: twl6040: Cache the vibra control registers Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 3/8] MFD: twl6040: function to query the vibra status for clients Peter Ujfalusi
2011-09-15 12:59 ` [PATCH 4/8] Input: twl6040-vibra: Check the selected path for vibra Peter Ujfalusi
2011-09-16 6:27 ` Dmitry Torokhov
2011-09-16 6:42 ` Péter Ujfalusi
2011-09-24 6:00 ` Dmitry Torokhov
2011-09-26 6:41 ` Péter Ujfalusi
2011-09-16 9:26 ` Liam Girdwood
2011-09-16 11:11 ` Péter Ujfalusi
2011-09-15 12:59 ` [PATCH 5/8] ASoC: twl6040: Fix the number of channels " Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:59 ` [PATCH 6/8] ASoC: twl6040: Correct supported number of playback channels Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:59 ` Peter Ujfalusi [this message]
2011-09-19 22:17 ` [alsa-devel] [PATCH 7/8] ASoC: omap-mcpdm: Correct the supported number of channels Mark Brown
2011-09-20 10:57 ` Mark Brown
2011-09-20 11:10 ` Péter Ujfalusi
2011-09-20 11:19 ` Liam Girdwood
2011-09-20 11:24 ` Péter Ujfalusi
2011-09-20 11:35 ` Mark Brown
2011-09-15 12:59 ` [PATCH 8/8] ASoC: twl6040: Support for vibra output paths Peter Ujfalusi
2011-09-21 13:12 ` Péter Ujfalusi
2011-09-21 13:26 ` Mark Brown
2011-09-21 13:10 ` [PATCH 0/8] ASoC/MFD/Input: twl6040: Support for audio driven vibra Péter Ujfalusi
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=1316091561-30899-8-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®