From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Vinod Koul <vinod.koul@intel.com>,
Mark Brown <broonie@kernel.org>, Arnd Bergmann <arnd@arndb.de>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
Simon <horms@verge.net.au>,
Laurent <laurent.pinchart@ideasonboard.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Linux-SH <linux-sh@vger.kernel.org>,
dmaengine@vger.kernel.org
Subject: [PATCH 16/24 v2] ASoC: rsnd: enable rsnd_ssi_use_busif() for DMA
Date: Fri, 20 Feb 2015 10:29:41 +0000 [thread overview]
Message-ID: <87sie0naca.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87fva0opax.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Renesas R-Car sound driver uses SSI, but the DMA interfaces are
SSI/SSIU. This interface is based on SSI/SRC/DVC connection.
And DMA function needs to know which interface is used somehow.
This patch enables rsnd_ssi_use_busif() for DMA.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- new patch
sound/soc/sh/rcar/dma.c | 2 +-
sound/soc/sh/rcar/rsnd.h | 1 +
sound/soc/sh/rcar/ssi.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index b449763..3f34461 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -427,7 +427,7 @@ rsnd_gen2_dma_addr(struct rsnd_priv *priv,
dev_err(dev, "DVC is selected without SRC\n");
/* use SSIU or SSI ? */
- if (is_ssi && (0 = strcmp(rsnd_mod_dma_name(mod), "ssiu")))
+ if (is_ssi && rsnd_ssi_use_busif(mod))
is_ssi++;
return (is_from) ?
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 0d36e38..68bc3f4 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -514,6 +514,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);
+int rsnd_ssi_use_busif(struct rsnd_mod *mod);
/*
* R-Car DVC
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index a0d902a..7e48d56 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -84,7 +84,7 @@ struct rsnd_ssi {
#define rsnd_ssi_mode_flags(p) ((p)->info->flags)
#define rsnd_ssi_dai_id(ssi) ((ssi)->info->dai_id)
-static int rsnd_ssi_use_busif(struct rsnd_mod *mod)
+int rsnd_ssi_use_busif(struct rsnd_mod *mod)
{
struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
--
1.7.9.5
next prev parent reply other threads:[~2015-02-20 10:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-20 10:21 [PATCH 0/24 v2] ASoC: rsnd: move 2nd DMAC in rsnd driver and subnode dma-name support Kuninori Morimoto
2015-02-20 10:22 ` [PATCH 01/24 v2] dmaengine: export symbol of of_dma_request_slave_channel() Kuninori Morimoto
2015-02-23 11:22 ` Geert Uytterhoeven
2015-02-24 0:40 ` Kuninori Morimoto
2015-02-24 0:54 ` [PATCH 01/28 v3] " Kuninori Morimoto
2015-02-24 16:38 ` Vinod Koul
2015-02-25 0:03 ` Kuninori Morimoto
2015-02-26 7:14 ` Vinod Koul
2015-03-05 7:15 ` Kuninori Morimoto
2015-03-07 15:03 ` Mark Brown
2015-02-20 10:22 ` [PATCH 02/24 v2] ASoC: rsnd: remove SH-DMA-BASE specific implementation Kuninori Morimoto
2015-02-20 10:23 ` [PATCH 03/24 v2] ASoC: rsnd: remove un-needed parameter from rsnd_dma_init() Kuninori Morimoto
2015-02-20 10:23 ` [PATCH 04/24 v2] ASoC: rsnd: remove unused rsnd_dma_available() Kuninori Morimoto
2015-02-20 10:24 ` [PATCH 05/24 v2] ASoC: rsnd: remove un-needed parameter from rsnd_dma_quit() Kuninori Morimoto
2015-02-20 10:24 ` [PATCH 06/24 v2] ASoC: rsnd: tidyup rsnd_dma_to_mod() macro declaration position Kuninori Morimoto
2015-02-20 10:24 ` [PATCH 07/24 v2] ASoC: rsnd: enable to get resource by name Kuninori Morimoto
2015-02-20 10:25 ` [PATCH 08/24 v2] ASoC: rsnd: add rsnd_gen_get_phy_addr() to get physical address Kuninori Morimoto
2015-02-20 10:25 ` [PATCH 09/24 v2] ASoC: rsnd: add dma.c for Audio DMAC / Audio DMAC peri peri Kuninori Morimoto
2015-02-20 10:26 ` [PATCH 10/24 v2] ASoC: rsnd: move rsnd_gen_dma_addr() from gen.c to dma.c Kuninori Morimoto
2015-02-20 10:27 ` [PATCH 11/24 v2] ASoC: rsnd: enable to care 1st / 2nd DMAC on rsnd_dma_xxx() Kuninori Morimoto
2015-02-20 10:27 ` [PATCH 12/24 v2] ASoC: rsnd: add Audio DMAC peri peri support rework Kuninori Morimoto
2015-02-20 10:28 ` [PATCH 13/24 v2] ASoC: rsnd: remove rsnd_dma::addr Kuninori Morimoto
2015-02-20 10:28 ` [PATCH 14/24 v2] ASoC: rsnd: remove rsnd_dma::dir Kuninori Morimoto
2015-02-20 10:29 ` [PATCH 15/24 v2] ASoC: rsnd: use union with rsnd_dmaen / rsnd_dmapp Kuninori Morimoto
2015-02-20 10:29 ` Kuninori Morimoto [this message]
2015-02-20 10:30 ` [PATCH 17/24 v2] ASoC: rsnd: ssi: add rsnd_ssi_of_node() Kuninori Morimoto
2015-02-20 10:30 ` [PATCH 18/24 v2] ASoC: rsnd: src: add rsnd_src_of_node() Kuninori Morimoto
2015-02-20 10:30 ` [PATCH 19/24 v2] ASoC: rsnd: dvc: add rsnd_dvc_of_node() Kuninori Morimoto
2015-02-20 10:31 ` [PATCH 20/24 v2] ASoC: rsnd: 1st DMAC dma-names cares subnode Kuninori Morimoto
2015-02-20 10:31 ` [PATCH 21/24 v2] ASoC: rsnd: add sample code of rcar_sound,src irq Kuninori Morimoto
2015-02-20 10:32 ` [PATCH 22/24 v2] ASoC: rsnd: add sample code of missing clocks Kuninori Morimoto
2015-02-20 10:32 ` [PATCH 23/24 v2] ASoC: rsnd: add sample code of dma entry Kuninori Morimoto
2015-02-20 10:33 ` [PATCH 24/24 v2] ASoC: rsnd: add sample code of reg-names Kuninori Morimoto
2015-03-07 15:08 ` [PATCH 0/24 v2] ASoC: rsnd: move 2nd DMAC in rsnd driver and subnode dma-name support Mark Brown
2015-03-10 0:30 ` Kuninori Morimoto
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=87sie0naca.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=lgirdwood@gmail.com \
--cc=linux-sh@vger.kernel.org \
--cc=vinod.koul@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