diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-10-02 01:48:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-10-04 12:50:32 +0200 |
| commit | 99dc79d0600849ff878a38d9884e76f5bebd3228 (patch) | |
| tree | f2e699636dd6170652776c5f0f46e51f041ee5b7 /sound/soc/sh | |
| parent | ASoC: rsnd: DVC kctrl sets once (diff) | |
| download | linux-99dc79d0600849ff878a38d9884e76f5bebd3228.tar.xz linux-99dc79d0600849ff878a38d9884e76f5bebd3228.zip | |
ASoC: rsnd: CTU kctrl sets once
Same CTU might be used few times if system/platform is using MIX.
For example below case.
DAI0 playback = <&src0 &ctu02 &mix0 &dvc0 &ssi0>;
DAI1 playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>;
This case, ALSA will have CTU,0 and CTU,1 kcontrol interfaces,
but these are same CTU. This is confusing.
This patch adds new flags and avoid such case.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/rcar/ctu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index e7f53f44165d..ad07ba8c3720 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -81,8 +81,11 @@ struct rsnd_ctu { struct rsnd_kctrl_cfg_m sv3; struct rsnd_kctrl_cfg_s reset; int channels; + u32 flags; }; +#define KCTRL_INITIALIZED (1 << 0) + #define rsnd_ctu_nr(priv) ((priv)->ctu_nr) #define for_each_rsnd_ctu(pos, priv, i) \ for ((i) = 0; \ @@ -277,6 +280,9 @@ static int rsnd_ctu_pcm_new(struct rsnd_mod *mod, struct rsnd_ctu *ctu = rsnd_mod_to_ctu(mod); int ret; + if (rsnd_flags_has(ctu, KCTRL_INITIALIZED)) + return 0; + /* CTU Pass */ ret = rsnd_kctrl_new_m(mod, io, rtd, "CTU Pass", rsnd_kctrl_accept_anytime, @@ -326,6 +332,8 @@ static int rsnd_ctu_pcm_new(struct rsnd_mod *mod, rsnd_ctu_value_reset, &ctu->reset, 1); + rsnd_flags_set(ctu, KCTRL_INITIALIZED); + return ret; } |