alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: alsa-devel@alsa-project.org
Cc: Sascha Hauer <s.hauer@pengutronix.de>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Valentin Longchamp <valentin.longchamp@epfl.ch>
Subject: [PATCH 1/3] imx-ssi: honor IMX_SSI_DMA flag
Date: Thu,  8 Apr 2010 11:31:24 +0200	[thread overview]
Message-ID: <1270719086-23453-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1270719086-23453-1-git-send-email-s.hauer@pengutronix.de>

When checking if we are DMA capable we have to check for the
IMX_SSI_DMA flag which is already set from platform_data instead
of setting it again when we want to do DMA.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 sound/soc/imx/imx-ssi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 6546b06..2a07fd3 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -653,7 +653,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
 	dai->private_data = ssi;
 
 	if ((cpu_is_mx27() || cpu_is_mx21()) &&
-			!(ssi->flags & IMX_SSI_USE_AC97)) {
+			!(ssi->flags & IMX_SSI_USE_AC97) &&
+			(ssi->flags & IMX_SSI_DMA)) {
 		ssi->flags |= IMX_SSI_DMA;
 		platform = imx_ssi_dma_mx2_init(pdev, ssi);
 	} else
-- 
1.7.0

  reply	other threads:[~2010-04-08  9:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-08  9:31 imx-ssi fixes Sascha Hauer
2010-04-08  9:31 ` Sascha Hauer [this message]
2010-04-08  9:31 ` [PATCH 2/3] imx-pcm-dma-mx2: restart DMA after an error Sascha Hauer
2010-04-08  9:31 ` [PATCH 3/3] imx-ssi: Use a hrtimer in FIQ mode Sascha Hauer
2010-04-08  9:53   ` Mark Brown
2010-04-08 13:13     ` Sascha Hauer
2010-04-08 13:30       ` Liam Girdwood
2010-04-08 15:40         ` Sascha Hauer
2010-04-08 14:03       ` Mark Brown
2010-04-08 15:14         ` Liam Girdwood
2010-04-08 15:45           ` Mark Brown
2010-04-08 15:29   ` Valentin Longchamp
2010-04-08 14:47 ` imx-ssi fixes Mark Brown
2010-04-08 15:51   ` Sascha Hauer
2010-04-08 15:54     ` Mark Brown

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=1270719086-23453-2-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=valentin.longchamp@epfl.ch \
    /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;
as well as URLs for NNTP newsgroup(s).