ASoC: codecs: lpass-rx-macro: add iir widgets
This patch adds iir widgets and mixers on this codec Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20210211122735.5691-5-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
4f692926f5
commit
f3ce6f3c9a
1 changed files with 264 additions and 0 deletions
|
@ -525,6 +525,38 @@ enum {
|
||||||
INTERP_MIX_PATH,
|
INTERP_MIX_PATH,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* Codec supports 2 IIR filters */
|
||||||
|
enum {
|
||||||
|
IIR0 = 0,
|
||||||
|
IIR1,
|
||||||
|
IIR_MAX,
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Each IIR has 5 Filter Stages */
|
||||||
|
enum {
|
||||||
|
BAND1 = 0,
|
||||||
|
BAND2,
|
||||||
|
BAND3,
|
||||||
|
BAND4,
|
||||||
|
BAND5,
|
||||||
|
BAND_MAX,
|
||||||
|
};
|
||||||
|
|
||||||
|
#define RX_MACRO_IIR_FILTER_SIZE (sizeof(u32) * BAND_MAX)
|
||||||
|
|
||||||
|
#define RX_MACRO_IIR_FILTER_CTL(xname, iidx, bidx) \
|
||||||
|
{ \
|
||||||
|
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
|
||||||
|
.info = rx_macro_iir_filter_info, \
|
||||||
|
.get = rx_macro_get_iir_band_audio_mixer, \
|
||||||
|
.put = rx_macro_put_iir_band_audio_mixer, \
|
||||||
|
.private_value = (unsigned long)&(struct wcd_iir_filter_ctl) { \
|
||||||
|
.iir_idx = iidx, \
|
||||||
|
.band_idx = bidx, \
|
||||||
|
.bytes_ext = {.max = RX_MACRO_IIR_FILTER_SIZE, }, \
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
|
||||||
struct interp_sample_rate {
|
struct interp_sample_rate {
|
||||||
int sample_rate;
|
int sample_rate;
|
||||||
int rate_val;
|
int rate_val;
|
||||||
|
@ -581,6 +613,12 @@ struct rx_macro {
|
||||||
};
|
};
|
||||||
#define to_rx_macro(_hw) container_of(_hw, struct rx_macro, hw)
|
#define to_rx_macro(_hw) container_of(_hw, struct rx_macro, hw)
|
||||||
|
|
||||||
|
struct wcd_iir_filter_ctl {
|
||||||
|
unsigned int iir_idx;
|
||||||
|
unsigned int band_idx;
|
||||||
|
struct soc_bytes_ext bytes_ext;
|
||||||
|
};
|
||||||
|
|
||||||
static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400);
|
static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400);
|
||||||
|
|
||||||
static const char * const rx_int_mix_mux_text[] = {
|
static const char * const rx_int_mix_mux_text[] = {
|
||||||
|
@ -2596,6 +2634,166 @@ static int rx_macro_enable_rx_path_clk(struct snd_soc_dapm_widget *w,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int rx_macro_set_iir_gain(struct snd_soc_dapm_widget *w,
|
||||||
|
struct snd_kcontrol *kcontrol, int event)
|
||||||
|
{
|
||||||
|
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
|
||||||
|
|
||||||
|
switch (event) {
|
||||||
|
case SND_SOC_DAPM_POST_PMU: /* fall through */
|
||||||
|
case SND_SOC_DAPM_PRE_PMD:
|
||||||
|
if (strnstr(w->name, "IIR0", sizeof("IIR0"))) {
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B1_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B1_CTL));
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B2_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B2_CTL));
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B3_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B3_CTL));
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B4_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B4_CTL));
|
||||||
|
} else {
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B1_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B1_CTL));
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B2_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B2_CTL));
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B3_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B3_CTL));
|
||||||
|
snd_soc_component_write(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B4_CTL,
|
||||||
|
snd_soc_component_read(component,
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B4_CTL));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t get_iir_band_coeff(struct snd_soc_component *component,
|
||||||
|
int iir_idx, int band_idx, int coeff_idx)
|
||||||
|
{
|
||||||
|
u32 value;
|
||||||
|
int reg, b2_reg;
|
||||||
|
|
||||||
|
/* Address does not automatically update if reading */
|
||||||
|
reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx;
|
||||||
|
b2_reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 16 * iir_idx;
|
||||||
|
|
||||||
|
snd_soc_component_write(component, reg,
|
||||||
|
((band_idx * BAND_MAX + coeff_idx) *
|
||||||
|
sizeof(uint32_t)) & 0x7F);
|
||||||
|
|
||||||
|
value = snd_soc_component_read(component, b2_reg);
|
||||||
|
snd_soc_component_write(component, reg,
|
||||||
|
((band_idx * BAND_MAX + coeff_idx)
|
||||||
|
* sizeof(uint32_t) + 1) & 0x7F);
|
||||||
|
|
||||||
|
value |= (snd_soc_component_read(component, b2_reg) << 8);
|
||||||
|
snd_soc_component_write(component, reg,
|
||||||
|
((band_idx * BAND_MAX + coeff_idx)
|
||||||
|
* sizeof(uint32_t) + 2) & 0x7F);
|
||||||
|
|
||||||
|
value |= (snd_soc_component_read(component, b2_reg) << 16);
|
||||||
|
snd_soc_component_write(component, reg,
|
||||||
|
((band_idx * BAND_MAX + coeff_idx)
|
||||||
|
* sizeof(uint32_t) + 3) & 0x7F);
|
||||||
|
|
||||||
|
/* Mask bits top 2 bits since they are reserved */
|
||||||
|
value |= (snd_soc_component_read(component, b2_reg) << 24);
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void set_iir_band_coeff(struct snd_soc_component *component,
|
||||||
|
int iir_idx, int band_idx, uint32_t value)
|
||||||
|
{
|
||||||
|
int reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 16 * iir_idx;
|
||||||
|
|
||||||
|
snd_soc_component_write(component, reg, (value & 0xFF));
|
||||||
|
snd_soc_component_write(component, reg, (value >> 8) & 0xFF);
|
||||||
|
snd_soc_component_write(component, reg, (value >> 16) & 0xFF);
|
||||||
|
/* Mask top 2 bits, 7-8 are reserved */
|
||||||
|
snd_soc_component_write(component, reg, (value >> 24) & 0x3F);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int rx_macro_put_iir_band_audio_mixer(
|
||||||
|
struct snd_kcontrol *kcontrol,
|
||||||
|
struct snd_ctl_elem_value *ucontrol)
|
||||||
|
{
|
||||||
|
struct snd_soc_component *component =
|
||||||
|
snd_soc_kcontrol_component(kcontrol);
|
||||||
|
struct wcd_iir_filter_ctl *ctl =
|
||||||
|
(struct wcd_iir_filter_ctl *)kcontrol->private_value;
|
||||||
|
struct soc_bytes_ext *params = &ctl->bytes_ext;
|
||||||
|
int iir_idx = ctl->iir_idx;
|
||||||
|
int band_idx = ctl->band_idx;
|
||||||
|
u32 coeff[BAND_MAX];
|
||||||
|
int reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx;
|
||||||
|
|
||||||
|
memcpy(&coeff[0], ucontrol->value.bytes.data, params->max);
|
||||||
|
|
||||||
|
/* Mask top bit it is reserved */
|
||||||
|
/* Updates addr automatically for each B2 write */
|
||||||
|
snd_soc_component_write(component, reg, (band_idx * BAND_MAX *
|
||||||
|
sizeof(uint32_t)) & 0x7F);
|
||||||
|
|
||||||
|
set_iir_band_coeff(component, iir_idx, band_idx, coeff[0]);
|
||||||
|
set_iir_band_coeff(component, iir_idx, band_idx, coeff[1]);
|
||||||
|
set_iir_band_coeff(component, iir_idx, band_idx, coeff[2]);
|
||||||
|
set_iir_band_coeff(component, iir_idx, band_idx, coeff[3]);
|
||||||
|
set_iir_band_coeff(component, iir_idx, band_idx, coeff[4]);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int rx_macro_get_iir_band_audio_mixer(struct snd_kcontrol *kcontrol,
|
||||||
|
struct snd_ctl_elem_value *ucontrol)
|
||||||
|
{
|
||||||
|
struct snd_soc_component *component =
|
||||||
|
snd_soc_kcontrol_component(kcontrol);
|
||||||
|
struct wcd_iir_filter_ctl *ctl =
|
||||||
|
(struct wcd_iir_filter_ctl *)kcontrol->private_value;
|
||||||
|
struct soc_bytes_ext *params = &ctl->bytes_ext;
|
||||||
|
int iir_idx = ctl->iir_idx;
|
||||||
|
int band_idx = ctl->band_idx;
|
||||||
|
u32 coeff[BAND_MAX];
|
||||||
|
|
||||||
|
coeff[0] = get_iir_band_coeff(component, iir_idx, band_idx, 0);
|
||||||
|
coeff[1] = get_iir_band_coeff(component, iir_idx, band_idx, 1);
|
||||||
|
coeff[2] = get_iir_band_coeff(component, iir_idx, band_idx, 2);
|
||||||
|
coeff[3] = get_iir_band_coeff(component, iir_idx, band_idx, 3);
|
||||||
|
coeff[4] = get_iir_band_coeff(component, iir_idx, band_idx, 4);
|
||||||
|
|
||||||
|
memcpy(ucontrol->value.bytes.data, &coeff[0], params->max);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int rx_macro_iir_filter_info(struct snd_kcontrol *kcontrol,
|
||||||
|
struct snd_ctl_elem_info *ucontrol)
|
||||||
|
{
|
||||||
|
struct wcd_iir_filter_ctl *ctl =
|
||||||
|
(struct wcd_iir_filter_ctl *)kcontrol->private_value;
|
||||||
|
struct soc_bytes_ext *params = &ctl->bytes_ext;
|
||||||
|
|
||||||
|
ucontrol->type = SNDRV_CTL_ELEM_TYPE_BYTES;
|
||||||
|
ucontrol->count = params->max;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct snd_kcontrol_new rx_macro_snd_controls[] = {
|
static const struct snd_kcontrol_new rx_macro_snd_controls[] = {
|
||||||
SOC_SINGLE_S8_TLV("RX_RX0 Digital Volume", CDC_RX_RX0_RX_VOL_CTL,
|
SOC_SINGLE_S8_TLV("RX_RX0 Digital Volume", CDC_RX_RX0_RX_VOL_CTL,
|
||||||
-84, 40, digital_gain),
|
-84, 40, digital_gain),
|
||||||
|
@ -2630,6 +2828,65 @@ static const struct snd_kcontrol_new rx_macro_snd_controls[] = {
|
||||||
SOC_SINGLE_EXT("AUX_HPF Switch", SND_SOC_NOPM, 0, 1, 0,
|
SOC_SINGLE_EXT("AUX_HPF Switch", SND_SOC_NOPM, 0, 1, 0,
|
||||||
rx_macro_aux_hpf_mode_get,
|
rx_macro_aux_hpf_mode_get,
|
||||||
rx_macro_aux_hpf_mode_put),
|
rx_macro_aux_hpf_mode_put),
|
||||||
|
|
||||||
|
SOC_SINGLE_S8_TLV("IIR0 INP0 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B1_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR0 INP1 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B2_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR0 INP2 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B3_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR0 INP3 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR0_IIR_GAIN_B4_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR1 INP0 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B1_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR1 INP1 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B2_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR1 INP2 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B3_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
SOC_SINGLE_S8_TLV("IIR1 INP3 Volume",
|
||||||
|
CDC_RX_SIDETONE_IIR1_IIR_GAIN_B4_CTL, -84, 40,
|
||||||
|
digital_gain),
|
||||||
|
|
||||||
|
SOC_SINGLE("IIR1 Band1 Switch", CDC_RX_SIDETONE_IIR0_IIR_CTL,
|
||||||
|
0, 1, 0),
|
||||||
|
SOC_SINGLE("IIR1 Band2 Switch", CDC_RX_SIDETONE_IIR0_IIR_CTL,
|
||||||
|
1, 1, 0),
|
||||||
|
SOC_SINGLE("IIR1 Band3 Switch", CDC_RX_SIDETONE_IIR0_IIR_CTL,
|
||||||
|
2, 1, 0),
|
||||||
|
SOC_SINGLE("IIR1 Band4 Switch", CDC_RX_SIDETONE_IIR0_IIR_CTL,
|
||||||
|
3, 1, 0),
|
||||||
|
SOC_SINGLE("IIR1 Band5 Switch", CDC_RX_SIDETONE_IIR0_IIR_CTL,
|
||||||
|
4, 1, 0),
|
||||||
|
SOC_SINGLE("IIR2 Band1 Switch", CDC_RX_SIDETONE_IIR1_IIR_CTL,
|
||||||
|
0, 1, 0),
|
||||||
|
SOC_SINGLE("IIR2 Band2 Switch", CDC_RX_SIDETONE_IIR1_IIR_CTL,
|
||||||
|
1, 1, 0),
|
||||||
|
SOC_SINGLE("IIR2 Band3 Switch", CDC_RX_SIDETONE_IIR1_IIR_CTL,
|
||||||
|
2, 1, 0),
|
||||||
|
SOC_SINGLE("IIR2 Band4 Switch", CDC_RX_SIDETONE_IIR1_IIR_CTL,
|
||||||
|
3, 1, 0),
|
||||||
|
SOC_SINGLE("IIR2 Band5 Switch", CDC_RX_SIDETONE_IIR1_IIR_CTL,
|
||||||
|
4, 1, 0),
|
||||||
|
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR0 Band1", IIR0, BAND1),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR0 Band2", IIR0, BAND2),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR0 Band3", IIR0, BAND3),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR0 Band4", IIR0, BAND4),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR0 Band5", IIR0, BAND5),
|
||||||
|
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR1 Band1", IIR1, BAND1),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR1 Band2", IIR1, BAND2),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR1 Band3", IIR1, BAND3),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR1 Band4", IIR1, BAND4),
|
||||||
|
RX_MACRO_IIR_FILTER_CTL("IIR1 Band5", IIR1, BAND5),
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int rx_macro_enable_echo(struct snd_soc_dapm_widget *w,
|
static int rx_macro_enable_echo(struct snd_soc_dapm_widget *w,
|
||||||
|
@ -2725,6 +2982,13 @@ static const struct snd_soc_dapm_widget rx_macro_dapm_widgets[] = {
|
||||||
RX_MACRO_EC2_MUX, 0,
|
RX_MACRO_EC2_MUX, 0,
|
||||||
&rx_mix_tx2_mux, rx_macro_enable_echo,
|
&rx_mix_tx2_mux, rx_macro_enable_echo,
|
||||||
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||||
|
|
||||||
|
SND_SOC_DAPM_MIXER_E("IIR0", CDC_RX_SIDETONE_IIR0_IIR_PATH_CTL,
|
||||||
|
4, 0, NULL, 0, rx_macro_set_iir_gain,
|
||||||
|
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
|
||||||
|
SND_SOC_DAPM_MIXER_E("IIR1", CDC_RX_SIDETONE_IIR1_IIR_PATH_CTL,
|
||||||
|
4, 0, NULL, 0, rx_macro_set_iir_gain,
|
||||||
|
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
|
||||||
SND_SOC_DAPM_MIXER("SRC0", CDC_RX_SIDETONE_SRC0_ST_SRC_PATH_CTL,
|
SND_SOC_DAPM_MIXER("SRC0", CDC_RX_SIDETONE_SRC0_ST_SRC_PATH_CTL,
|
||||||
4, 0, NULL, 0),
|
4, 0, NULL, 0),
|
||||||
SND_SOC_DAPM_MIXER("SRC1", CDC_RX_SIDETONE_SRC1_ST_SRC_PATH_CTL,
|
SND_SOC_DAPM_MIXER("SRC1", CDC_RX_SIDETONE_SRC1_ST_SRC_PATH_CTL,
|
||||||
|
|
Loading…
Add table
Reference in a new issue