diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-07-28 18:58:29 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-06 17:56:13 +0100 |
| commit | 4b4dab82340d969521f4f86108441cb597c8595d (patch) | |
| tree | 25729bfd18f16bb735f53fe4deeee33577f6a71e /sound/soc/sh/rcar/gen.c | |
| parent | 70263cb474853c116f80713d468f3c17d805921c (diff) | |
| download | kernel_goldelico_gta04-4b4dab82340d969521f4f86108441cb597c8595d.zip kernel_goldelico_gta04-4b4dab82340d969521f4f86108441cb597c8595d.tar.gz kernel_goldelico_gta04-4b4dab82340d969521f4f86108441cb597c8595d.tar.bz2 | |
ASoC: rsnd: remove platform dai and add dai_id on platform setting
Current rsnd driver is using struct rsnd_dai_platform_info
so that indicate sound DAI information (playback/capture SSI ID).
But, SSI settings were also required separately.
Thus, platform settings was very un-understandable.
This patch adds dai_id to SSI
settings, and removed rsnd_dai_platform_info.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sh/rcar/gen.c')
| -rw-r--r-- | sound/soc/sh/rcar/gen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 61232cd..460c57e 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -49,7 +49,6 @@ static int rsnd_gen1_path_init(struct rsnd_priv *priv, struct rsnd_dai *rdai, struct rsnd_dai_stream *io) { - struct rsnd_dai_platform_info *info = rsnd_dai_get_platform_info(rdai); struct rsnd_mod *mod; int ret; int id; @@ -67,10 +66,11 @@ static int rsnd_gen1_path_init(struct rsnd_priv *priv, * Then, SSI id = SCU id here */ - if (rsnd_dai_is_play(rdai, io)) - id = info->ssi_id_playback; - else - id = info->ssi_id_capture; + /* get SSI's ID */ + mod = rsnd_ssi_mod_get_frm_dai(priv, + rsnd_dai_id(priv, rdai), + rsnd_dai_is_play(rdai, io)); + id = rsnd_mod_id(mod); /* SSI */ mod = rsnd_ssi_mod_get(priv, id); |