forked from luck/tmp_suning_uos_patched
ASoC: rsnd: move snd_kcontrol_new fucntions to core.c
Current DVC is using snd_kcontrol_new functions, but, SRC will need same method. Move common functions to core.c Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto
Mark Brown
parent
4d24d44e4d
commit
170a2497a2
|
|
@ -969,6 +969,150 @@ static struct snd_pcm_ops rsnd_pcm_ops = {
|
|||
.pointer = rsnd_pointer,
|
||||
};
|
||||
|
||||
/*
|
||||
* snd_kcontrol
|
||||
*/
|
||||
#define kcontrol_to_cfg(kctrl) ((struct rsnd_kctrl_cfg *)kctrl->private_value)
|
||||
static int rsnd_kctrl_info(struct snd_kcontrol *kctrl,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
struct rsnd_kctrl_cfg *cfg = kcontrol_to_cfg(kctrl);
|
||||
|
||||
if (cfg->texts) {
|
||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
||||
uinfo->count = cfg->size;
|
||||
uinfo->value.enumerated.items = cfg->max;
|
||||
if (uinfo->value.enumerated.item >= cfg->max)
|
||||
uinfo->value.enumerated.item = cfg->max - 1;
|
||||
strlcpy(uinfo->value.enumerated.name,
|
||||
cfg->texts[uinfo->value.enumerated.item],
|
||||
sizeof(uinfo->value.enumerated.name));
|
||||
} else {
|
||||
uinfo->count = cfg->size;
|
||||
uinfo->value.integer.min = 0;
|
||||
uinfo->value.integer.max = cfg->max;
|
||||
uinfo->type = (cfg->max == 1) ?
|
||||
SNDRV_CTL_ELEM_TYPE_BOOLEAN :
|
||||
SNDRV_CTL_ELEM_TYPE_INTEGER;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rsnd_kctrl_get(struct snd_kcontrol *kctrl,
|
||||
struct snd_ctl_elem_value *uc)
|
||||
{
|
||||
struct rsnd_kctrl_cfg *cfg = kcontrol_to_cfg(kctrl);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < cfg->size; i++)
|
||||
if (cfg->texts)
|
||||
uc->value.enumerated.item[i] = cfg->val[i];
|
||||
else
|
||||
uc->value.integer.value[i] = cfg->val[i];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rsnd_kctrl_put(struct snd_kcontrol *kctrl,
|
||||
struct snd_ctl_elem_value *uc)
|
||||
{
|
||||
struct rsnd_mod *mod = snd_kcontrol_chip(kctrl);
|
||||
struct rsnd_kctrl_cfg *cfg = kcontrol_to_cfg(kctrl);
|
||||
int i, change = 0;
|
||||
|
||||
for (i = 0; i < cfg->size; i++) {
|
||||
if (cfg->texts) {
|
||||
change |= (uc->value.enumerated.item[i] != cfg->val[i]);
|
||||
cfg->val[i] = uc->value.enumerated.item[i];
|
||||
} else {
|
||||
change |= (uc->value.integer.value[i] != cfg->val[i]);
|
||||
cfg->val[i] = uc->value.integer.value[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (change)
|
||||
cfg->update(mod);
|
||||
|
||||
return change;
|
||||
}
|
||||
|
||||
static int __rsnd_kctrl_new(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_kctrl_cfg *cfg,
|
||||
void (*update)(struct rsnd_mod *mod))
|
||||
{
|
||||
struct snd_card *card = rtd->card->snd_card;
|
||||
struct snd_kcontrol *kctrl;
|
||||
struct snd_kcontrol_new knew = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = name,
|
||||
.info = rsnd_kctrl_info,
|
||||
.get = rsnd_kctrl_get,
|
||||
.put = rsnd_kctrl_put,
|
||||
.private_value = (unsigned long)cfg,
|
||||
};
|
||||
int ret;
|
||||
|
||||
kctrl = snd_ctl_new1(&knew, mod);
|
||||
if (!kctrl)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = snd_ctl_add(card, kctrl);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
cfg->update = update;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rsnd_kctrl_new_m(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
void (*update)(struct rsnd_mod *mod),
|
||||
struct rsnd_kctrl_cfg_m *_cfg,
|
||||
u32 max)
|
||||
{
|
||||
_cfg->cfg.max = max;
|
||||
_cfg->cfg.size = RSND_DVC_CHANNELS;
|
||||
_cfg->cfg.val = _cfg->val;
|
||||
return __rsnd_kctrl_new(mod, rdai, rtd, name, &_cfg->cfg, update);
|
||||
}
|
||||
|
||||
int rsnd_kctrl_new_s(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
void (*update)(struct rsnd_mod *mod),
|
||||
struct rsnd_kctrl_cfg_s *_cfg,
|
||||
u32 max)
|
||||
{
|
||||
_cfg->cfg.max = max;
|
||||
_cfg->cfg.size = 1;
|
||||
_cfg->cfg.val = &_cfg->val;
|
||||
return __rsnd_kctrl_new(mod, rdai, rtd, name, &_cfg->cfg, update);
|
||||
}
|
||||
|
||||
int rsnd_kctrl_new_e(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_kctrl_cfg_s *_cfg,
|
||||
void (*update)(struct rsnd_mod *mod),
|
||||
const char * const *texts,
|
||||
u32 max)
|
||||
{
|
||||
_cfg->cfg.max = max;
|
||||
_cfg->cfg.size = 1;
|
||||
_cfg->cfg.val = &_cfg->val;
|
||||
_cfg->cfg.texts = texts;
|
||||
return __rsnd_kctrl_new(mod, rdai, rtd, name, &_cfg->cfg, update);
|
||||
}
|
||||
|
||||
/*
|
||||
* snd_soc_platform
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -11,36 +11,18 @@
|
|||
#include "rsnd.h"
|
||||
|
||||
#define RSND_DVC_NAME_SIZE 16
|
||||
#define RSND_DVC_CHANNELS 2
|
||||
|
||||
#define DVC_NAME "dvc"
|
||||
|
||||
struct rsnd_dvc_cfg {
|
||||
unsigned int max;
|
||||
unsigned int size;
|
||||
u32 *val;
|
||||
const char * const *texts;
|
||||
};
|
||||
|
||||
struct rsnd_dvc_cfg_m {
|
||||
struct rsnd_dvc_cfg cfg;
|
||||
u32 val[RSND_DVC_CHANNELS];
|
||||
};
|
||||
|
||||
struct rsnd_dvc_cfg_s {
|
||||
struct rsnd_dvc_cfg cfg;
|
||||
u32 val;
|
||||
};
|
||||
|
||||
struct rsnd_dvc {
|
||||
struct rsnd_dvc_platform_info *info; /* rcar_snd.h */
|
||||
struct rsnd_mod mod;
|
||||
struct clk *clk;
|
||||
struct rsnd_dvc_cfg_m volume;
|
||||
struct rsnd_dvc_cfg_m mute;
|
||||
struct rsnd_dvc_cfg_s ren; /* Ramp Enable */
|
||||
struct rsnd_dvc_cfg_s rup; /* Ramp Rate Up */
|
||||
struct rsnd_dvc_cfg_s rdown; /* Ramp Rate Down */
|
||||
struct rsnd_kctrl_cfg_m volume;
|
||||
struct rsnd_kctrl_cfg_m mute;
|
||||
struct rsnd_kctrl_cfg_s ren; /* Ramp Enable */
|
||||
struct rsnd_kctrl_cfg_s rup; /* Ramp Rate Up */
|
||||
struct rsnd_kctrl_cfg_s rdown; /* Ramp Rate Down */
|
||||
};
|
||||
|
||||
#define rsnd_mod_to_dvc(_mod) \
|
||||
|
|
@ -222,140 +204,6 @@ static int rsnd_dvc_stop(struct rsnd_mod *mod,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rsnd_dvc_volume_info(struct snd_kcontrol *kctrl,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
struct rsnd_dvc_cfg *cfg = (struct rsnd_dvc_cfg *)kctrl->private_value;
|
||||
|
||||
if (cfg->texts) {
|
||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
||||
uinfo->count = cfg->size;
|
||||
uinfo->value.enumerated.items = cfg->max;
|
||||
if (uinfo->value.enumerated.item >= cfg->max)
|
||||
uinfo->value.enumerated.item = cfg->max - 1;
|
||||
strlcpy(uinfo->value.enumerated.name,
|
||||
cfg->texts[uinfo->value.enumerated.item],
|
||||
sizeof(uinfo->value.enumerated.name));
|
||||
} else {
|
||||
uinfo->count = cfg->size;
|
||||
uinfo->value.integer.min = 0;
|
||||
uinfo->value.integer.max = cfg->max;
|
||||
uinfo->type = (cfg->max == 1) ?
|
||||
SNDRV_CTL_ELEM_TYPE_BOOLEAN :
|
||||
SNDRV_CTL_ELEM_TYPE_INTEGER;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rsnd_dvc_volume_get(struct snd_kcontrol *kctrl,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct rsnd_dvc_cfg *cfg = (struct rsnd_dvc_cfg *)kctrl->private_value;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < cfg->size; i++)
|
||||
if (cfg->texts)
|
||||
ucontrol->value.enumerated.item[i] = cfg->val[i];
|
||||
else
|
||||
ucontrol->value.integer.value[i] = cfg->val[i];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rsnd_dvc_volume_put(struct snd_kcontrol *kctrl,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct rsnd_mod *mod = snd_kcontrol_chip(kctrl);
|
||||
struct rsnd_dvc_cfg *cfg = (struct rsnd_dvc_cfg *)kctrl->private_value;
|
||||
int i, change = 0;
|
||||
|
||||
for (i = 0; i < cfg->size; i++) {
|
||||
if (cfg->texts) {
|
||||
change |= (ucontrol->value.enumerated.item[i] != cfg->val[i]);
|
||||
cfg->val[i] = ucontrol->value.enumerated.item[i];
|
||||
} else {
|
||||
change |= (ucontrol->value.integer.value[i] != cfg->val[i]);
|
||||
cfg->val[i] = ucontrol->value.integer.value[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (change)
|
||||
rsnd_dvc_volume_update(mod);
|
||||
|
||||
return change;
|
||||
}
|
||||
|
||||
static int __rsnd_dvc_pcm_new(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_dvc_cfg *private)
|
||||
{
|
||||
struct snd_card *card = rtd->card->snd_card;
|
||||
struct snd_kcontrol *kctrl;
|
||||
struct snd_kcontrol_new knew = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = name,
|
||||
.info = rsnd_dvc_volume_info,
|
||||
.get = rsnd_dvc_volume_get,
|
||||
.put = rsnd_dvc_volume_put,
|
||||
.private_value = (unsigned long)private,
|
||||
};
|
||||
int ret;
|
||||
|
||||
kctrl = snd_ctl_new1(&knew, mod);
|
||||
if (!kctrl)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = snd_ctl_add(card, kctrl);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _rsnd_dvc_pcm_new_m(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_dvc_cfg_m *private,
|
||||
u32 max)
|
||||
{
|
||||
private->cfg.max = max;
|
||||
private->cfg.size = RSND_DVC_CHANNELS;
|
||||
private->cfg.val = private->val;
|
||||
return __rsnd_dvc_pcm_new(mod, rdai, rtd, name, &private->cfg);
|
||||
}
|
||||
|
||||
static int _rsnd_dvc_pcm_new_s(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_dvc_cfg_s *private,
|
||||
u32 max)
|
||||
{
|
||||
private->cfg.max = max;
|
||||
private->cfg.size = 1;
|
||||
private->cfg.val = &private->val;
|
||||
return __rsnd_dvc_pcm_new(mod, rdai, rtd, name, &private->cfg);
|
||||
}
|
||||
|
||||
static int _rsnd_dvc_pcm_new_e(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_dvc_cfg_s *private,
|
||||
const char * const *texts,
|
||||
u32 max)
|
||||
{
|
||||
private->cfg.max = max;
|
||||
private->cfg.size = 1;
|
||||
private->cfg.val = &private->val;
|
||||
private->cfg.texts = texts;
|
||||
return __rsnd_dvc_pcm_new(mod, rdai, rtd, name, &private->cfg);
|
||||
}
|
||||
|
||||
static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd)
|
||||
|
|
@ -365,41 +213,46 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
|
|||
int ret;
|
||||
|
||||
/* Volume */
|
||||
ret = _rsnd_dvc_pcm_new_m(mod, rdai, rtd,
|
||||
ret = rsnd_kctrl_new_m(mod, rdai, rtd,
|
||||
rsnd_dai_is_play(rdai, io) ?
|
||||
"DVC Out Playback Volume" : "DVC In Capture Volume",
|
||||
rsnd_dvc_volume_update,
|
||||
&dvc->volume, 0x00800000 - 1);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* Mute */
|
||||
ret = _rsnd_dvc_pcm_new_m(mod, rdai, rtd,
|
||||
ret = rsnd_kctrl_new_m(mod, rdai, rtd,
|
||||
rsnd_dai_is_play(rdai, io) ?
|
||||
"DVC Out Mute Switch" : "DVC In Mute Switch",
|
||||
rsnd_dvc_volume_update,
|
||||
&dvc->mute, 1);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* Ramp */
|
||||
ret = _rsnd_dvc_pcm_new_s(mod, rdai, rtd,
|
||||
ret = rsnd_kctrl_new_s(mod, rdai, rtd,
|
||||
rsnd_dai_is_play(rdai, io) ?
|
||||
"DVC Out Ramp Switch" : "DVC In Ramp Switch",
|
||||
rsnd_dvc_volume_update,
|
||||
&dvc->ren, 1);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = _rsnd_dvc_pcm_new_e(mod, rdai, rtd,
|
||||
ret = rsnd_kctrl_new_e(mod, rdai, rtd,
|
||||
rsnd_dai_is_play(rdai, io) ?
|
||||
"DVC Out Ramp Up Rate" : "DVC In Ramp Up Rate",
|
||||
&dvc->rup,
|
||||
rsnd_dvc_volume_update,
|
||||
dvc_ramp_rate, ARRAY_SIZE(dvc_ramp_rate));
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = _rsnd_dvc_pcm_new_e(mod, rdai, rtd,
|
||||
ret = rsnd_kctrl_new_e(mod, rdai, rtd,
|
||||
rsnd_dai_is_play(rdai, io) ?
|
||||
"DVC Out Ramp Down Rate" : "DVC In Ramp Down Rate",
|
||||
&dvc->rdown,
|
||||
rsnd_dvc_volume_update,
|
||||
dvc_ramp_rate, ARRAY_SIZE(dvc_ramp_rate));
|
||||
|
||||
if (ret < 0)
|
||||
|
|
|
|||
|
|
@ -417,6 +417,51 @@ struct rsnd_priv {
|
|||
is_play; \
|
||||
})
|
||||
|
||||
/*
|
||||
* rsnd_kctrl
|
||||
*/
|
||||
struct rsnd_kctrl_cfg {
|
||||
unsigned int max;
|
||||
unsigned int size;
|
||||
u32 *val;
|
||||
const char * const *texts;
|
||||
void (*update)(struct rsnd_mod *mod);
|
||||
};
|
||||
|
||||
#define RSND_DVC_CHANNELS 2
|
||||
struct rsnd_kctrl_cfg_m {
|
||||
struct rsnd_kctrl_cfg cfg;
|
||||
u32 val[RSND_DVC_CHANNELS];
|
||||
};
|
||||
|
||||
struct rsnd_kctrl_cfg_s {
|
||||
struct rsnd_kctrl_cfg cfg;
|
||||
u32 val;
|
||||
};
|
||||
|
||||
int rsnd_kctrl_new_m(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
void (*update)(struct rsnd_mod *mod),
|
||||
struct rsnd_kctrl_cfg_m *_cfg,
|
||||
u32 max);
|
||||
int rsnd_kctrl_new_s(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
void (*update)(struct rsnd_mod *mod),
|
||||
struct rsnd_kctrl_cfg_s *_cfg,
|
||||
u32 max);
|
||||
int rsnd_kctrl_new_e(struct rsnd_mod *mod,
|
||||
struct rsnd_dai *rdai,
|
||||
struct snd_soc_pcm_runtime *rtd,
|
||||
const unsigned char *name,
|
||||
struct rsnd_kctrl_cfg_s *_cfg,
|
||||
void (*update)(struct rsnd_mod *mod),
|
||||
const char * const *texts,
|
||||
u32 max);
|
||||
|
||||
/*
|
||||
* R-Car SRC
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user