Skip to content

Commit

Permalink
ASoC: rsnd: add rsnd_ssi_is_play()
Browse files Browse the repository at this point in the history
SCU needs SSI direction if Gen2.
Add rsnd_ssi_is_play() function for it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Feb 3, 2014
1 parent 28dc4b6 commit 32f27eb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions sound/soc/sh/rcar/rsnd.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,5 +321,6 @@ struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
int dai_id, int is_play);
int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
int rsnd_ssi_is_play(struct rsnd_mod *mod);

#endif
11 changes: 9 additions & 2 deletions sound/soc/sh/rcar/ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
if (rsnd_ssi_dai_id(ssi) != dai_id)
continue;

has_play = !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_PLAY);
has_play = rsnd_ssi_is_play(&ssi->mod);

if (is_play == has_play)
return &ssi->mod;
Expand All @@ -518,6 +518,13 @@ int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE);
}

int rsnd_ssi_is_play(struct rsnd_mod *mod)
{
struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_PLAY);
}

static void rsnd_ssi_parent_clk_setup(struct rsnd_priv *priv, struct rsnd_ssi *ssi)
{
if (!rsnd_ssi_is_pin_sharing(&ssi->mod))
Expand Down Expand Up @@ -582,7 +589,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
if (pinfo->dma_id > 0) {
ret = rsnd_dma_init(
priv, rsnd_mod_to_dma(&ssi->mod),
(rsnd_ssi_mode_flags(ssi) & RSND_SSI_PLAY),
rsnd_ssi_is_play(&ssi->mod),
pinfo->dma_id,
rsnd_ssi_dma_inquiry,
rsnd_ssi_dma_complete);
Expand Down

0 comments on commit 32f27eb

Please sign in to comment.