Commit b918f1bc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: DVC kctrl sets once



Same DVC 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 DVC,0 and DVC,1 kcontrol interfaces,
but these are same DVC. This is confusing.
This patch adds new flags and avoid such case.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d0cf7fc9
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -44,8 +44,11 @@ struct rsnd_dvc {
	struct rsnd_kctrl_cfg_s ren;	/* Ramp Enable */
	struct rsnd_kctrl_cfg_s ren;	/* Ramp Enable */
	struct rsnd_kctrl_cfg_s rup;	/* Ramp Rate Up */
	struct rsnd_kctrl_cfg_s rup;	/* Ramp Rate Up */
	struct rsnd_kctrl_cfg_s rdown;	/* Ramp Rate Down */
	struct rsnd_kctrl_cfg_s rdown;	/* Ramp Rate Down */
	u32 flags;
};
};


#define KCTRL_INITIALIZED	(1 << 0)

#define rsnd_dvc_get(priv, id) ((struct rsnd_dvc *)(priv->dvc) + id)
#define rsnd_dvc_get(priv, id) ((struct rsnd_dvc *)(priv->dvc) + id)
#define rsnd_dvc_nr(priv) ((priv)->dvc_nr)
#define rsnd_dvc_nr(priv) ((priv)->dvc_nr)


@@ -254,6 +257,9 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
	int channels = rsnd_rdai_channels_get(rdai);
	int channels = rsnd_rdai_channels_get(rdai);
	int ret;
	int ret;


	if (rsnd_flags_has(dvc, KCTRL_INITIALIZED))
		return 0;

	/* Volume */
	/* Volume */
	ret = rsnd_kctrl_new_m(mod, io, rtd,
	ret = rsnd_kctrl_new_m(mod, io, rtd,
			is_play ?
			is_play ?
@@ -307,6 +313,8 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
	if (ret < 0)
	if (ret < 0)
		return ret;
		return ret;


	rsnd_flags_set(dvc, KCTRL_INITIALIZED);

	return 0;
	return 0;
}
}