openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rsnd: add MIX Volume Ramp support 

Both DVC/MIX have Volume Ramp Control. This patch supprts MIX
Volume Ramp. One note is that main purpose of MIX Volume Ramp
is to reduce noise, thus, MIX Ramp range is very few if you
compare to DVC Volume Ramp (DVC = 5bit, MIX = 4bit).

You can use MIX Volume Ranp like below
	amixer set "MIX Ramp Up Rate"   "0.125 dB/1 step"
	amixer set "MIX Ramp Down Rate" "0.125 dB/1 step"
	amixer set "MIX Ramp" on
	aplay xxx.wav &
	amixer set "MIX",0  80%  // DAI0 Volume Down
	amixer set "MIX",1 100%  // DAI1 Volume Up

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>
This commit is contained in:
Kuninori Morimoto 2017-10-01 23:49:18 +00:00 committed by Mark Brown
parent f3c26ac61c
commit 3e3c9ee1e4
3 changed files with 154 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/sh/rcar/core.c
View File

@ -1253,7 +1253,7 @@ const char * const volume_ramp_rate[] = {
"1 dB/1 step", /* 00111 */ "1 dB/1 step", /* 00111 */
"0.5 dB/1 step", /* 01000 */ "0.5 dB/1 step", /* 01000 */
"0.25 dB/1 step", /* 01001 */ "0.25 dB/1 step", /* 01001 */
"0.125 dB/1 step", /* 01010 */ "0.125 dB/1 step", /* 01010 = VOLUME_RAMP_MAX_MIX */
"0.125 dB/2 steps", /* 01011 */ "0.125 dB/2 steps", /* 01011 */
"0.125 dB/4 steps", /* 01100 */ "0.125 dB/4 steps", /* 01100 */
"0.125 dB/8 steps", /* 01101 */ "0.125 dB/8 steps", /* 01101 */

158
sound/soc/sh/rcar/mix.c
View File

@ -7,6 +7,33 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/*
* CTUn MIXn
* +------+ +------+
* [SRC3 / SRC6] -> |CTU n0| -> [MIX n0| ->
* [SRC4 / SRC9] -> |CTU n1| -> [MIX n1| ->
* [SRC0 / SRC1] -> |CTU n2| -> [MIX n2| ->
* [SRC2 / SRC5] -> |CTU n3| -> [MIX n3| ->
* +------+ +------+
*
* ex)
* DAI0 : playback = <&src0 &ctu02 &mix0 &dvc0 &ssi0>;
* DAI1 : playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>;
*
* MIX Volume
* amixer set "MIX",0 100% // DAI0 Volume
* amixer set "MIX",1 100% // DAI1 Volume
*
* Volume Ramp
* amixer set "MIX Ramp Up Rate" "0.125 dB/1 step"
* amixer set "MIX Ramp Down Rate" "4 dB/1 step"
* amixer set "MIX Ramp" on
* aplay xxx.wav &
* amixer set "MIX",0 80% // DAI0 Volume Down
* amixer set "MIX",1 100% // DAI1 Volume Up
*/
#include "rsnd.h" #include "rsnd.h"
#define MIX_NAME_SIZE 16 #define MIX_NAME_SIZE 16
@ -14,8 +41,27 @@
struct rsnd_mix { struct rsnd_mix {
struct rsnd_mod mod; struct rsnd_mod mod;
struct rsnd_kctrl_cfg_s volumeA; /* MDBAR */
struct rsnd_kctrl_cfg_s volumeB; /* MDBBR */
struct rsnd_kctrl_cfg_s volumeC; /* MDBCR */
struct rsnd_kctrl_cfg_s volumeD; /* MDBDR */
struct rsnd_kctrl_cfg_s ren; /* Ramp Enable */
struct rsnd_kctrl_cfg_s rup; /* Ramp Rate Up */
struct rsnd_kctrl_cfg_s rdw; /* Ramp Rate Down */
u32 flags;
}; };
#define ONCE_KCTRL_INITIALIZED (1 << 0)
#define HAS_VOLA (1 << 1)
#define HAS_VOLB (1 << 2)
#define HAS_VOLC (1 << 3)
#define HAS_VOLD (1 << 4)
#define VOL_MAX 0x3ff
#define rsnd_mod_to_mix(_mod) \
container_of((_mod), struct rsnd_mix, mod)
#define rsnd_mix_get(priv, id) ((struct rsnd_mix *)(priv->mix) + id) #define rsnd_mix_get(priv, id) ((struct rsnd_mix *)(priv->mix) + id)
#define rsnd_mix_nr(priv) ((priv)->mix_nr) #define rsnd_mix_nr(priv) ((priv)->mix_nr)
#define for_each_rsnd_mix(pos, priv, i) \ #define for_each_rsnd_mix(pos, priv, i) \
@ -36,26 +82,43 @@ static void rsnd_mix_halt(struct rsnd_mod *mod)
rsnd_mod_write(mod, MIX_SWRSR, 0); rsnd_mod_write(mod, MIX_SWRSR, 0);
} }
#define rsnd_mix_get_vol(mix, X) \
rsnd_flags_has(mix, HAS_VOL##X) ? \
(VOL_MAX - mix->volume##X.cfg.val[0]) : 0
static void rsnd_mix_volume_parameter(struct rsnd_dai_stream *io, static void rsnd_mix_volume_parameter(struct rsnd_dai_stream *io,
struct rsnd_mod *mod) struct rsnd_mod *mod)
{ {
rsnd_mod_write(mod, MIX_MDBAR, 0); struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
rsnd_mod_write(mod, MIX_MDBBR, 0); struct device *dev = rsnd_priv_to_dev(priv);
rsnd_mod_write(mod, MIX_MDBCR, 0); struct rsnd_mix *mix = rsnd_mod_to_mix(mod);
rsnd_mod_write(mod, MIX_MDBDR, 0); u32 volA = rsnd_mix_get_vol(mix, A);
u32 volB = rsnd_mix_get_vol(mix, B);
u32 volC = rsnd_mix_get_vol(mix, C);
u32 volD = rsnd_mix_get_vol(mix, D);
dev_dbg(dev, "MIX A/B/C/D = %02x/%02x/%02x/%02x\n",
volA, volB, volC, volD);
rsnd_mod_write(mod, MIX_MDBAR, volA);
rsnd_mod_write(mod, MIX_MDBBR, volB);
rsnd_mod_write(mod, MIX_MDBCR, volC);
rsnd_mod_write(mod, MIX_MDBDR, volD);
} }
static void rsnd_mix_volume_init(struct rsnd_dai_stream *io, static void rsnd_mix_volume_init(struct rsnd_dai_stream *io,
struct rsnd_mod *mod) struct rsnd_mod *mod)
{ {
struct rsnd_mix *mix = rsnd_mod_to_mix(mod);
rsnd_mod_write(mod, MIX_MIXIR, 1); rsnd_mod_write(mod, MIX_MIXIR, 1);
/* General Information */ /* General Information */
rsnd_mod_write(mod, MIX_ADINR, rsnd_runtime_channel_after_ctu(io)); rsnd_mod_write(mod, MIX_ADINR, rsnd_runtime_channel_after_ctu(io));
/* volume step */ /* volume step */
rsnd_mod_write(mod, MIX_MIXMR, 0); rsnd_mod_write(mod, MIX_MIXMR, mix->ren.cfg.val[0]);
rsnd_mod_write(mod, MIX_MVPDR, 0); rsnd_mod_write(mod, MIX_MVPDR, mix->rup.cfg.val[0] << 8 |
mix->rdw.cfg.val[0]);
/* common volume parameter */ /* common volume parameter */
rsnd_mix_volume_parameter(io, mod); rsnd_mix_volume_parameter(io, mod);
@ -109,11 +172,94 @@ static int rsnd_mix_quit(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_mix_pcm_new(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct snd_soc_pcm_runtime *rtd)
{
struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_mix *mix = rsnd_mod_to_mix(mod);
struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
struct rsnd_kctrl_cfg_s *volume;
int ret;
switch (rsnd_mod_id(src_mod)) {
case 3:
case 6: /* MDBAR */
volume = &mix->volumeA;
rsnd_flags_set(mix, HAS_VOLA);
break;
case 4:
case 9: /* MDBBR */
volume = &mix->volumeB;
rsnd_flags_set(mix, HAS_VOLB);
break;
case 0:
case 1: /* MDBCR */
volume = &mix->volumeC;
rsnd_flags_set(mix, HAS_VOLC);
break;
case 2:
case 5: /* MDBDR */
volume = &mix->volumeD;
rsnd_flags_set(mix, HAS_VOLD);
break;
default:
dev_err(dev, "unknown SRC is connected\n");
return -EINVAL;
}
/* Volume */
ret = rsnd_kctrl_new_s(mod, io, rtd,
"MIX Playback Volume",
rsnd_kctrl_accept_anytime,
rsnd_mix_volume_update,
volume, VOL_MAX);
if (ret < 0)
return ret;
volume->cfg.val[0] = VOL_MAX;
if (rsnd_flags_has(mix, ONCE_KCTRL_INITIALIZED))
return ret;
/* Ramp */
ret = rsnd_kctrl_new_s(mod, io, rtd,
"MIX Ramp Switch",
rsnd_kctrl_accept_anytime,
rsnd_mix_volume_update,
&mix->ren, 1);
if (ret < 0)
return ret;
ret = rsnd_kctrl_new_e(mod, io, rtd,
"MIX Ramp Up Rate",
rsnd_kctrl_accept_anytime,
rsnd_mix_volume_update,
&mix->rup,
volume_ramp_rate,
VOLUME_RAMP_MAX_MIX);
if (ret < 0)
return ret;
ret = rsnd_kctrl_new_e(mod, io, rtd,
"MIX Ramp Down Rate",
rsnd_kctrl_accept_anytime,
rsnd_mix_volume_update,
&mix->rdw,
volume_ramp_rate,
VOLUME_RAMP_MAX_MIX);
rsnd_flags_set(mix, ONCE_KCTRL_INITIALIZED);
return ret;
}
static struct rsnd_mod_ops rsnd_mix_ops = { static struct rsnd_mod_ops rsnd_mix_ops = {
.name = MIX_NAME, .name = MIX_NAME,
.probe = rsnd_mix_probe_, .probe = rsnd_mix_probe_,
.init = rsnd_mix_init, .init = rsnd_mix_init,
.quit = rsnd_mix_quit, .quit = rsnd_mix_quit,
.pcm_new = rsnd_mix_pcm_new,
}; };
struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id) struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id)

1
sound/soc/sh/rcar/rsnd.h
View File

@ -662,6 +662,7 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
extern const char * const volume_ramp_rate[]; extern const char * const volume_ramp_rate[];
#define VOLUME_RAMP_MAX_DVC (0x17 + 1) #define VOLUME_RAMP_MAX_DVC (0x17 + 1)
#define VOLUME_RAMP_MAX_MIX (0x0a + 1)
/* /*
* R-Car SSI * R-Car SSI