ASoC: arizona: Implement stability check for EQ coefficients
Subsystems (3)
PATCH 1/2 ASoC: arizona: Implement stability check for EQ coefficients
Specifying unstable coefficients for the EQ can have a severe impact on the audio. This patchs adds a stability check on the coefficients written to the EQ, for this it is necessary to merge the mode control and the coefficients as some coefficients may only be unstable with a certain mode setting so it is ideal if these are always updated in sync.
--- sound/soc/codecs/arizona.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/arizona.h | 10 +++++++ sound/soc/codecs/wm5102.c | 12 +++------ sound/soc/codecs/wm5110.c | 12 +++------ sound/soc/codecs/wm8997.c | 12 +++------ 5 files changed, 81 insertions(+), 24 deletions(-)
sound/soc/codecs/arizona.c +59 -0
@@ -2313,6 +2313,65 @@ const struct snd_kcontrol_new arizona_adsp2_rate_controls[] = { };EXPORT_SYMBOL_GPL (arizona_adsp2_rate_controls); +static bool arizona_eq_filter_unstable (bool mode,__be16 _a,__be16 _b) +{ +s16 a =be16_to_cpu (_a); +s16 b =be16_to_cpu (_b); + +if (!mode) { +return abs (a) >=4096 ; + }else { +if (abs (b) >=4096 ) +return true; + +return (abs ((a <<16 ) / (4096 - b)) >=4096 <<4 ); + } +} + +int arizona_eq_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct arizona *arizona =dev_get_drvdata (codec->dev->parent); +struct soc_bytes *params = (void *)kcontrol->private_value; +unsigned int val; +__be16 *data; +int len; +int ret; + + len = params->num_regs *regmap_get_val_bytes (arizona->regmap); + + data =kmemdup (ucontrol->value.bytes.data, len,GFP_KERNEL |GFP_DMA ); +if (!data) +return -ENOMEM ; + + data[0 ] &=cpu_to_be16 (ARIZONA_EQ1_B1_MODE ); + +if (arizona_eq_filter_unstable (!!data[0 ], data[1 ], data[2 ]) || +arizona_eq_filter_unstable (true, data[4 ], data[5 ]) || +arizona_eq_filter_unstable (true, data[8 ], data[9 ]) || +arizona_eq_filter_unstable (true, data[12 ], data[13 ]) || +arizona_eq_filter_unstable (false, data[16 ], data[17 ])) { +dev_err (arizona->dev,"Rejecting unstable EQ coefficients\n" ); + ret = -EINVAL ; + goto out; + } + + ret =regmap_read (arizona->regmap, params->base, &val); +if (ret !=0 ) + goto out; + + val &= ~ARIZONA_EQ1_B1_MODE ; + data[0 ] |=cpu_to_be16 (val); + + ret =regmap_raw_write (arizona->regmap, params->base, data, len); + +out: +kfree (data); +return ret; +} +EXPORT_SYMBOL_GPL (arizona_eq_coeff_put); +MODULE_DESCRIPTION ("ASoC Wolfson Arizona class device support" );MODULE_AUTHOR ("Mark Brown <[email protected]>" );MODULE_LICENSE ("GPL" );
sound/soc/codecs/arizona.h +10 -0
@@ -194,6 +194,13 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];ARIZONA_MIXER_ROUTES (name" Preloader" , name"L" ), \ ARIZONA_MIXER_ROUTES(name " Preloader", name "R") +#define ARIZONA_EQ_CONTROL (xname, xbase) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \ + .put = arizona_eq_coeff_put, .private_value = \ + ((unsigned long)&(struct soc_bytes) { .base = xbase, \ + .num_regs = 20, .mask = ~ARIZONA_EQ1_B1_MODE }) } +#define ARIZONA_RATE_ENUM_SIZE 4extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE ];extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE ];
@@ -229,6 +236,9 @@ extern int arizona_hp_ev(struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol, int event); +extern int arizona_eq_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +extern int arizona_set_sysclk (struct snd_soc_codec *codec,int clk_id,int source,unsigned int freq,int dir);
sound/soc/codecs/wm5102.c +4 -8
@@ -788,8 +788,7 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("EQ3" ,ARIZONA_EQ3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ4" ,ARIZONA_EQ4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("EQ1 Coefficients" ,ARIZONA_EQ1_3 ,19 ), -SOC_SINGLE ("EQ1 Mode Switch" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ1 Coefficients" ,ARIZONA_EQ1_2 ),SOC_SINGLE_TLV ("EQ1 B1 Volume" ,ARIZONA_EQ1_1 ,ARIZONA_EQ1_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ1 B2 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B2_GAIN_SHIFT,
@@ -801,8 +800,7 @@ SOC_SINGLE_TLV("EQ1 B4 Volume", ARIZONA_EQ1_2, ARIZONA_EQ1_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ1 B5 Volume" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ2 Coefficients" ,ARIZONA_EQ2_3 ,19 ), -SOC_SINGLE ("EQ2 Mode Switch" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ2 Coefficients" ,ARIZONA_EQ2_2 ),SOC_SINGLE_TLV ("EQ2 B1 Volume" ,ARIZONA_EQ2_1 ,ARIZONA_EQ2_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ2 B2 Volume", ARIZONA_EQ2_1, ARIZONA_EQ2_B2_GAIN_SHIFT,
@@ -814,8 +812,7 @@ SOC_SINGLE_TLV("EQ2 B4 Volume", ARIZONA_EQ2_2, ARIZONA_EQ2_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ2 B5 Volume" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ3 Coefficients" ,ARIZONA_EQ3_3 ,19 ), -SOC_SINGLE ("EQ3 Mode Switch" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ3 Coefficients" ,ARIZONA_EQ3_2 ),SOC_SINGLE_TLV ("EQ3 B1 Volume" ,ARIZONA_EQ3_1 ,ARIZONA_EQ3_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ3 B2 Volume", ARIZONA_EQ3_1, ARIZONA_EQ3_B2_GAIN_SHIFT,
@@ -827,8 +824,7 @@ SOC_SINGLE_TLV("EQ3 B4 Volume", ARIZONA_EQ3_2, ARIZONA_EQ3_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ3 B5 Volume" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ4 Coefficients" ,ARIZONA_EQ4_3 ,19 ), -SOC_SINGLE ("EQ4 Mode Switch" ,ARIZONA_EQ4_2 ,ARIZONA_EQ4_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ4 Coefficients" ,ARIZONA_EQ4_2 ),SOC_SINGLE_TLV ("EQ4 B1 Volume" ,ARIZONA_EQ4_1 ,ARIZONA_EQ4_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ4 B2 Volume", ARIZONA_EQ4_1, ARIZONA_EQ4_B2_GAIN_SHIFT,
sound/soc/codecs/wm5110.c +4 -8
@@ -247,8 +247,7 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("EQ3" ,ARIZONA_EQ3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ4" ,ARIZONA_EQ4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("EQ1 Coefficients" ,ARIZONA_EQ1_3 ,19 ), -SOC_SINGLE ("EQ1 Mode Switch" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ1 Coefficients" ,ARIZONA_EQ1_2 ),SOC_SINGLE_TLV ("EQ1 B1 Volume" ,ARIZONA_EQ1_1 ,ARIZONA_EQ1_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ1 B2 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B2_GAIN_SHIFT,
@@ -260,8 +259,7 @@ SOC_SINGLE_TLV("EQ1 B4 Volume", ARIZONA_EQ1_2, ARIZONA_EQ1_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ1 B5 Volume" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ2 Coefficients" ,ARIZONA_EQ2_3 ,19 ), -SOC_SINGLE ("EQ2 Mode Switch" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ2 Coefficients" ,ARIZONA_EQ2_2 ),SOC_SINGLE_TLV ("EQ2 B1 Volume" ,ARIZONA_EQ2_1 ,ARIZONA_EQ2_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ2 B2 Volume", ARIZONA_EQ2_1, ARIZONA_EQ2_B2_GAIN_SHIFT,
@@ -273,8 +271,7 @@ SOC_SINGLE_TLV("EQ2 B4 Volume", ARIZONA_EQ2_2, ARIZONA_EQ2_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ2 B5 Volume" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ3 Coefficients" ,ARIZONA_EQ3_3 ,19 ), -SOC_SINGLE ("EQ3 Mode Switch" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ3 Coefficients" ,ARIZONA_EQ3_2 ),SOC_SINGLE_TLV ("EQ3 B1 Volume" ,ARIZONA_EQ3_1 ,ARIZONA_EQ3_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ3 B2 Volume", ARIZONA_EQ3_1, ARIZONA_EQ3_B2_GAIN_SHIFT,
@@ -286,8 +283,7 @@ SOC_SINGLE_TLV("EQ3 B4 Volume", ARIZONA_EQ3_2, ARIZONA_EQ3_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ3 B5 Volume" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ4 Coefficients" ,ARIZONA_EQ4_3 ,19 ), -SOC_SINGLE ("EQ4 Mode Switch" ,ARIZONA_EQ4_2 ,ARIZONA_EQ4_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ4 Coefficients" ,ARIZONA_EQ4_2 ),SOC_SINGLE_TLV ("EQ4 B1 Volume" ,ARIZONA_EQ4_1 ,ARIZONA_EQ4_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ4 B2 Volume", ARIZONA_EQ4_1, ARIZONA_EQ4_B2_GAIN_SHIFT,
sound/soc/codecs/wm8997.c +4 -8
@@ -174,8 +174,7 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("EQ3" ,ARIZONA_EQ3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ4" ,ARIZONA_EQ4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("EQ1 Coefficients" ,ARIZONA_EQ1_3 ,19 ), -SOC_SINGLE ("EQ1 Mode Switch" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ1 Coefficients" ,ARIZONA_EQ1_2 ),SOC_SINGLE_TLV ("EQ1 B1 Volume" ,ARIZONA_EQ1_1 ,ARIZONA_EQ1_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ1 B2 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B2_GAIN_SHIFT,
@@ -187,8 +186,7 @@ SOC_SINGLE_TLV("EQ1 B4 Volume", ARIZONA_EQ1_2, ARIZONA_EQ1_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ1 B5 Volume" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ2 Coefficients" ,ARIZONA_EQ2_3 ,19 ), -SOC_SINGLE ("EQ2 Mode Switch" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ2 Coefficients" ,ARIZONA_EQ2_2 ),SOC_SINGLE_TLV ("EQ2 B1 Volume" ,ARIZONA_EQ2_1 ,ARIZONA_EQ2_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ2 B2 Volume", ARIZONA_EQ2_1, ARIZONA_EQ2_B2_GAIN_SHIFT,
@@ -200,8 +198,7 @@ SOC_SINGLE_TLV("EQ2 B4 Volume", ARIZONA_EQ2_2, ARIZONA_EQ2_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ2 B5 Volume" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ3 Coefficients" ,ARIZONA_EQ3_3 ,19 ), -SOC_SINGLE ("EQ3 Mode Switch" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ3 Coefficients" ,ARIZONA_EQ3_2 ),SOC_SINGLE_TLV ("EQ3 B1 Volume" ,ARIZONA_EQ3_1 ,ARIZONA_EQ3_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ3 B2 Volume", ARIZONA_EQ3_1, ARIZONA_EQ3_B2_GAIN_SHIFT,
@@ -213,8 +210,7 @@ SOC_SINGLE_TLV("EQ3 B4 Volume", ARIZONA_EQ3_2, ARIZONA_EQ3_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ3 B5 Volume" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ4 Coefficients" ,ARIZONA_EQ4_3 ,19 ), -SOC_SINGLE ("EQ4 Mode Switch" ,ARIZONA_EQ4_2 ,ARIZONA_EQ4_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ4 Coefficients" ,ARIZONA_EQ4_2 ),SOC_SINGLE_TLV ("EQ4 B1 Volume" ,ARIZONA_EQ4_1 ,ARIZONA_EQ4_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ4 B2 Volume", ARIZONA_EQ4_1, ARIZONA_EQ4_B2_GAIN_SHIFT,
Signature · 1 line
1.7.2.5
PATCH 2/2 ASoC: arizona: Implement stability check for LHPF coefficients
Specifying unstable coefficients for the low/high pass filters can have a severe impact on the audio. This patchs adds a stability check on the coefficients written to the low/high pass filter block to prevent this.
--- sound/soc/codecs/arizona.c | 17 +++++++++++++++++ sound/soc/codecs/arizona.h | 9 +++++++++ sound/soc/codecs/wm5102.c | 8 ++++---- sound/soc/codecs/wm5110.c | 8 ++++---- sound/soc/codecs/wm8997.c | 8 ++++---- 5 files changed, 38 insertions(+), 12 deletions(-)
sound/soc/codecs/arizona.c +17 -0
@@ -2372,6 +2372,23 @@ out: }EXPORT_SYMBOL_GPL (arizona_eq_coeff_put); +int arizona_lhpf_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct arizona *arizona =dev_get_drvdata (codec->dev->parent); +__be16 *data = (__be16 *)ucontrol->value.bytes.data; +s16 val =be16_to_cpu (*data); + +if (abs (val) >=4096 ) { +dev_err (arizona->dev,"Rejecting unstable LHPF coefficients\n" ); +return -EINVAL ; + } + +return snd_soc_bytes_put (kcontrol, ucontrol); +} +EXPORT_SYMBOL_GPL (arizona_lhpf_coeff_put); +MODULE_DESCRIPTION ("ASoC Wolfson Arizona class device support" );MODULE_AUTHOR ("Mark Brown <[email protected]>" );MODULE_LICENSE ("GPL" );
sound/soc/codecs/arizona.h +9 -0
@@ -201,6 +201,13 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; ((unsigned long )&(struct soc_bytes ) { .base = xbase, \ .num_regs = 20, .mask = ~ARIZONA_EQ1_B1_MODE }) } +#define ARIZONA_LHPF_CONTROL (xname, xbase) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \ + .put = arizona_lhpf_coeff_put, .private_value = \ + ((unsigned long)&(struct soc_bytes) { .base = xbase, \ + .num_regs = 1 }) } +#define ARIZONA_RATE_ENUM_SIZE 4extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE ];extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE ];
@@ -238,6 +245,8 @@ extern int arizona_hp_ev(struct snd_soc_dapm_widget *w,extern int arizona_eq_coeff_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol); +extern int arizona_lhpf_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol);extern int arizona_set_sysclk (struct snd_soc_codec *codec,int clk_id,int source,unsigned int freq,int dir);
sound/soc/codecs/wm5102.c +4 -4
@@ -847,10 +847,10 @@ ARIZONA_MIXER_CONTROLS("LHPF2", ARIZONA_HPLP2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("LHPF3" ,ARIZONA_HPLP3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("LHPF4" ,ARIZONA_HPLP4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ,1 ), -SND_SOC_BYTES ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ,1 ), -SND_SOC_BYTES ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ,1 ), -SND_SOC_BYTES ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ,1 ), +ARIZONA_LHPF_CONTROL ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ), +ARIZONA_LHPF_CONTROL ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ), +ARIZONA_LHPF_CONTROL ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ), +ARIZONA_LHPF_CONTROL ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ),ARIZONA_MIXER_CONTROLS ("DSP1L" ,ARIZONA_DSP1LMIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),
sound/soc/codecs/wm5110.c +4 -4
@@ -310,10 +310,10 @@ ARIZONA_MIXER_CONTROLS("LHPF2", ARIZONA_HPLP2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("LHPF3" ,ARIZONA_HPLP3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("LHPF4" ,ARIZONA_HPLP4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ,1 ), -SND_SOC_BYTES ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ,1 ), -SND_SOC_BYTES ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ,1 ), -SND_SOC_BYTES ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ,1 ), +ARIZONA_LHPF_CONTROL ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ), +ARIZONA_LHPF_CONTROL ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ), +ARIZONA_LHPF_CONTROL ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ), +ARIZONA_LHPF_CONTROL ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ),SOC_ENUM ("LHPF1 Mode" , arizona_lhpf1_mode), SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),
sound/soc/codecs/wm8997.c +4 -4
@@ -238,10 +238,10 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),SOC_ENUM ("LHPF3 Mode" , arizona_lhpf3_mode),SOC_ENUM ("LHPF4 Mode" , arizona_lhpf4_mode), -SND_SOC_BYTES ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ,1 ), -SND_SOC_BYTES ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ,1 ), -SND_SOC_BYTES ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ,1 ), -SND_SOC_BYTES ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ,1 ), +ARIZONA_LHPF_CONTROL ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ), +ARIZONA_LHPF_CONTROL ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ), +ARIZONA_LHPF_CONTROL ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ), +ARIZONA_LHPF_CONTROL ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ),SOC_ENUM ("ISRC1 FSL" , arizona_isrc_fsl[0 ]), SOC_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
Signature · 1 line
1.7.2.5
Mark Brown
maintainerApplied "ASoC: arizona: Implement stability check for LHPF coefficients" to the asoc tree
The patch
ASoC: arizona: Implement stability check for LHPF coefficients
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
5f8e671a49e1d608fcf52c8944ea7818cd4c99a9Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Thu, 25 Jun 2015 09:35:12 +0100
Subject: [PATCH] ASoC: arizona: Implement stability check for LHPF
coefficients
Specifying unstable coefficients for the low/high pass filters can have a severe impact on the audio. This patchs adds a stability check on the coefficients written to the low/high pass filter block to prevent this.
--- sound/soc/codecs/arizona.c | 17 +++++++++++++++++ sound/soc/codecs/arizona.h | 9 +++++++++ sound/soc/codecs/wm5102.c | 8 ++++---- sound/soc/codecs/wm5110.c | 8 ++++---- sound/soc/codecs/wm8997.c | 8 ++++---- 5 files changed, 38 insertions(+), 12 deletions(-)
sound/soc/codecs/arizona.c +17 -0
@@ -2372,6 +2372,23 @@ out: }EXPORT_SYMBOL_GPL (arizona_eq_coeff_put); +int arizona_lhpf_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct arizona *arizona =dev_get_drvdata (codec->dev->parent); +__be16 *data = (__be16 *)ucontrol->value.bytes.data; +s16 val =be16_to_cpu (*data); + +if (abs (val) >=4096 ) { +dev_err (arizona->dev,"Rejecting unstable LHPF coefficients\n" ); +return -EINVAL ; + } + +return snd_soc_bytes_put (kcontrol, ucontrol); +} +EXPORT_SYMBOL_GPL (arizona_lhpf_coeff_put); +MODULE_DESCRIPTION ("ASoC Wolfson Arizona class device support" );MODULE_AUTHOR ("Mark Brown <[email protected]>" );MODULE_LICENSE ("GPL" );
sound/soc/codecs/arizona.h +9 -0
@@ -201,6 +201,13 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; ((unsigned long )&(struct soc_bytes ) { .base = xbase, \ .num_regs = 20, .mask = ~ARIZONA_EQ1_B1_MODE }) } +#define ARIZONA_LHPF_CONTROL (xname, xbase) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \ + .put = arizona_lhpf_coeff_put, .private_value = \ + ((unsigned long)&(struct soc_bytes) { .base = xbase, \ + .num_regs = 1 }) } +#define ARIZONA_RATE_ENUM_SIZE 4extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE ];extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE ];
@@ -238,6 +245,8 @@ extern int arizona_hp_ev(struct snd_soc_dapm_widget *w,extern int arizona_eq_coeff_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol); +extern int arizona_lhpf_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol);extern int arizona_set_sysclk (struct snd_soc_codec *codec,int clk_id,int source,unsigned int freq,int dir);
sound/soc/codecs/wm5102.c +4 -4
@@ -847,10 +847,10 @@ ARIZONA_MIXER_CONTROLS("LHPF2", ARIZONA_HPLP2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("LHPF3" ,ARIZONA_HPLP3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("LHPF4" ,ARIZONA_HPLP4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ,1 ), -SND_SOC_BYTES ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ,1 ), -SND_SOC_BYTES ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ,1 ), -SND_SOC_BYTES ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ,1 ), +ARIZONA_LHPF_CONTROL ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ), +ARIZONA_LHPF_CONTROL ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ), +ARIZONA_LHPF_CONTROL ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ), +ARIZONA_LHPF_CONTROL ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ),ARIZONA_MIXER_CONTROLS ("DSP1L" ,ARIZONA_DSP1LMIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),
sound/soc/codecs/wm5110.c +4 -4
@@ -310,10 +310,10 @@ ARIZONA_MIXER_CONTROLS("LHPF2", ARIZONA_HPLP2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("LHPF3" ,ARIZONA_HPLP3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("LHPF4" ,ARIZONA_HPLP4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ,1 ), -SND_SOC_BYTES ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ,1 ), -SND_SOC_BYTES ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ,1 ), -SND_SOC_BYTES ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ,1 ), +ARIZONA_LHPF_CONTROL ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ), +ARIZONA_LHPF_CONTROL ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ), +ARIZONA_LHPF_CONTROL ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ), +ARIZONA_LHPF_CONTROL ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ),SOC_ENUM ("LHPF1 Mode" , arizona_lhpf1_mode), SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),
sound/soc/codecs/wm8997.c +4 -4
@@ -238,10 +238,10 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),SOC_ENUM ("LHPF3 Mode" , arizona_lhpf3_mode),SOC_ENUM ("LHPF4 Mode" , arizona_lhpf4_mode), -SND_SOC_BYTES ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ,1 ), -SND_SOC_BYTES ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ,1 ), -SND_SOC_BYTES ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ,1 ), -SND_SOC_BYTES ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ,1 ), +ARIZONA_LHPF_CONTROL ("LHPF1 Coefficients" ,ARIZONA_HPLPF1_2 ), +ARIZONA_LHPF_CONTROL ("LHPF2 Coefficients" ,ARIZONA_HPLPF2_2 ), +ARIZONA_LHPF_CONTROL ("LHPF3 Coefficients" ,ARIZONA_HPLPF3_2 ), +ARIZONA_LHPF_CONTROL ("LHPF4 Coefficients" ,ARIZONA_HPLPF4_2 ),SOC_ENUM ("ISRC1 FSL" , arizona_isrc_fsl[0 ]), SOC_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: arizona: Implement stability check for EQ coefficients" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: arizona: Implement stability check for EQ coefficients
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c05d9a8c7f55a901d9e8ec2a5f0730137bbfea4aMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Thu, 25 Jun 2015 09:35:11 +0100
Subject: [PATCH] ASoC: arizona: Implement stability check for EQ coefficients
Specifying unstable coefficients for the EQ can have a severe impact on the audio. This patchs adds a stability check on the coefficients written to the EQ, for this it is necessary to merge the mode control and the coefficients as some coefficients may only be unstable with a certain mode setting so it is ideal if these are always updated in sync.
--- sound/soc/codecs/arizona.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/arizona.h | 10 ++++++++ sound/soc/codecs/wm5102.c | 12 ++++------ sound/soc/codecs/wm5110.c | 12 ++++------ sound/soc/codecs/wm8997.c | 12 ++++------ 5 files changed, 81 insertions(+), 24 deletions(-)
sound/soc/codecs/arizona.c +59 -0
@@ -2313,6 +2313,65 @@ const struct snd_kcontrol_new arizona_adsp2_rate_controls[] = { };EXPORT_SYMBOL_GPL (arizona_adsp2_rate_controls); +static bool arizona_eq_filter_unstable (bool mode,__be16 _a,__be16 _b) +{ +s16 a =be16_to_cpu (_a); +s16 b =be16_to_cpu (_b); + +if (!mode) { +return abs (a) >=4096 ; + }else { +if (abs (b) >=4096 ) +return true; + +return (abs ((a <<16 ) / (4096 - b)) >=4096 <<4 ); + } +} + +int arizona_eq_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct arizona *arizona =dev_get_drvdata (codec->dev->parent); +struct soc_bytes *params = (void *)kcontrol->private_value; +unsigned int val; +__be16 *data; +int len; +int ret; + + len = params->num_regs *regmap_get_val_bytes (arizona->regmap); + + data =kmemdup (ucontrol->value.bytes.data, len,GFP_KERNEL |GFP_DMA ); +if (!data) +return -ENOMEM ; + + data[0 ] &=cpu_to_be16 (ARIZONA_EQ1_B1_MODE ); + +if (arizona_eq_filter_unstable (!!data[0 ], data[1 ], data[2 ]) || +arizona_eq_filter_unstable (true, data[4 ], data[5 ]) || +arizona_eq_filter_unstable (true, data[8 ], data[9 ]) || +arizona_eq_filter_unstable (true, data[12 ], data[13 ]) || +arizona_eq_filter_unstable (false, data[16 ], data[17 ])) { +dev_err (arizona->dev,"Rejecting unstable EQ coefficients\n" ); + ret = -EINVAL ; + goto out; + } + + ret =regmap_read (arizona->regmap, params->base, &val); +if (ret !=0 ) + goto out; + + val &= ~ARIZONA_EQ1_B1_MODE ; + data[0 ] |=cpu_to_be16 (val); + + ret =regmap_raw_write (arizona->regmap, params->base, data, len); + +out: +kfree (data); +return ret; +} +EXPORT_SYMBOL_GPL (arizona_eq_coeff_put); +MODULE_DESCRIPTION ("ASoC Wolfson Arizona class device support" );MODULE_AUTHOR ("Mark Brown <[email protected]>" );MODULE_LICENSE ("GPL" );
sound/soc/codecs/arizona.h +10 -0
@@ -194,6 +194,13 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];ARIZONA_MIXER_ROUTES (name" Preloader" , name"L" ), \ ARIZONA_MIXER_ROUTES(name " Preloader", name "R") +#define ARIZONA_EQ_CONTROL (xname, xbase) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \ + .put = arizona_eq_coeff_put, .private_value = \ + ((unsigned long)&(struct soc_bytes) { .base = xbase, \ + .num_regs = 20, .mask = ~ARIZONA_EQ1_B1_MODE }) } +#define ARIZONA_RATE_ENUM_SIZE 4extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE ];extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE ];
@@ -229,6 +236,9 @@ extern int arizona_hp_ev(struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol, int event); +extern int arizona_eq_coeff_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +extern int arizona_set_sysclk (struct snd_soc_codec *codec,int clk_id,int source,unsigned int freq,int dir);
sound/soc/codecs/wm5102.c +4 -8
@@ -788,8 +788,7 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("EQ3" ,ARIZONA_EQ3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ4" ,ARIZONA_EQ4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("EQ1 Coefficients" ,ARIZONA_EQ1_3 ,19 ), -SOC_SINGLE ("EQ1 Mode Switch" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ1 Coefficients" ,ARIZONA_EQ1_2 ),SOC_SINGLE_TLV ("EQ1 B1 Volume" ,ARIZONA_EQ1_1 ,ARIZONA_EQ1_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ1 B2 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B2_GAIN_SHIFT,
@@ -801,8 +800,7 @@ SOC_SINGLE_TLV("EQ1 B4 Volume", ARIZONA_EQ1_2, ARIZONA_EQ1_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ1 B5 Volume" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ2 Coefficients" ,ARIZONA_EQ2_3 ,19 ), -SOC_SINGLE ("EQ2 Mode Switch" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ2 Coefficients" ,ARIZONA_EQ2_2 ),SOC_SINGLE_TLV ("EQ2 B1 Volume" ,ARIZONA_EQ2_1 ,ARIZONA_EQ2_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ2 B2 Volume", ARIZONA_EQ2_1, ARIZONA_EQ2_B2_GAIN_SHIFT,
@@ -814,8 +812,7 @@ SOC_SINGLE_TLV("EQ2 B4 Volume", ARIZONA_EQ2_2, ARIZONA_EQ2_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ2 B5 Volume" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ3 Coefficients" ,ARIZONA_EQ3_3 ,19 ), -SOC_SINGLE ("EQ3 Mode Switch" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ3 Coefficients" ,ARIZONA_EQ3_2 ),SOC_SINGLE_TLV ("EQ3 B1 Volume" ,ARIZONA_EQ3_1 ,ARIZONA_EQ3_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ3 B2 Volume", ARIZONA_EQ3_1, ARIZONA_EQ3_B2_GAIN_SHIFT,
@@ -827,8 +824,7 @@ SOC_SINGLE_TLV("EQ3 B4 Volume", ARIZONA_EQ3_2, ARIZONA_EQ3_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ3 B5 Volume" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ4 Coefficients" ,ARIZONA_EQ4_3 ,19 ), -SOC_SINGLE ("EQ4 Mode Switch" ,ARIZONA_EQ4_2 ,ARIZONA_EQ4_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ4 Coefficients" ,ARIZONA_EQ4_2 ),SOC_SINGLE_TLV ("EQ4 B1 Volume" ,ARIZONA_EQ4_1 ,ARIZONA_EQ4_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ4 B2 Volume", ARIZONA_EQ4_1, ARIZONA_EQ4_B2_GAIN_SHIFT,
sound/soc/codecs/wm5110.c +4 -8
@@ -247,8 +247,7 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("EQ3" ,ARIZONA_EQ3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ4" ,ARIZONA_EQ4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("EQ1 Coefficients" ,ARIZONA_EQ1_3 ,19 ), -SOC_SINGLE ("EQ1 Mode Switch" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ1 Coefficients" ,ARIZONA_EQ1_2 ),SOC_SINGLE_TLV ("EQ1 B1 Volume" ,ARIZONA_EQ1_1 ,ARIZONA_EQ1_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ1 B2 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B2_GAIN_SHIFT,
@@ -260,8 +259,7 @@ SOC_SINGLE_TLV("EQ1 B4 Volume", ARIZONA_EQ1_2, ARIZONA_EQ1_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ1 B5 Volume" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ2 Coefficients" ,ARIZONA_EQ2_3 ,19 ), -SOC_SINGLE ("EQ2 Mode Switch" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ2 Coefficients" ,ARIZONA_EQ2_2 ),SOC_SINGLE_TLV ("EQ2 B1 Volume" ,ARIZONA_EQ2_1 ,ARIZONA_EQ2_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ2 B2 Volume", ARIZONA_EQ2_1, ARIZONA_EQ2_B2_GAIN_SHIFT,
@@ -273,8 +271,7 @@ SOC_SINGLE_TLV("EQ2 B4 Volume", ARIZONA_EQ2_2, ARIZONA_EQ2_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ2 B5 Volume" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ3 Coefficients" ,ARIZONA_EQ3_3 ,19 ), -SOC_SINGLE ("EQ3 Mode Switch" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ3 Coefficients" ,ARIZONA_EQ3_2 ),SOC_SINGLE_TLV ("EQ3 B1 Volume" ,ARIZONA_EQ3_1 ,ARIZONA_EQ3_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ3 B2 Volume", ARIZONA_EQ3_1, ARIZONA_EQ3_B2_GAIN_SHIFT,
@@ -286,8 +283,7 @@ SOC_SINGLE_TLV("EQ3 B4 Volume", ARIZONA_EQ3_2, ARIZONA_EQ3_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ3 B5 Volume" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ4 Coefficients" ,ARIZONA_EQ4_3 ,19 ), -SOC_SINGLE ("EQ4 Mode Switch" ,ARIZONA_EQ4_2 ,ARIZONA_EQ4_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ4 Coefficients" ,ARIZONA_EQ4_2 ),SOC_SINGLE_TLV ("EQ4 B1 Volume" ,ARIZONA_EQ4_1 ,ARIZONA_EQ4_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ4 B2 Volume", ARIZONA_EQ4_1, ARIZONA_EQ4_B2_GAIN_SHIFT,
sound/soc/codecs/wm8997.c +4 -8
@@ -174,8 +174,7 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("EQ3" ,ARIZONA_EQ3MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ4" ,ARIZONA_EQ4MIX_INPUT_1_SOURCE ), -SND_SOC_BYTES ("EQ1 Coefficients" ,ARIZONA_EQ1_3 ,19 ), -SOC_SINGLE ("EQ1 Mode Switch" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ1 Coefficients" ,ARIZONA_EQ1_2 ),SOC_SINGLE_TLV ("EQ1 B1 Volume" ,ARIZONA_EQ1_1 ,ARIZONA_EQ1_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ1 B2 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B2_GAIN_SHIFT,
@@ -187,8 +186,7 @@ SOC_SINGLE_TLV("EQ1 B4 Volume", ARIZONA_EQ1_2, ARIZONA_EQ1_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ1 B5 Volume" ,ARIZONA_EQ1_2 ,ARIZONA_EQ1_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ2 Coefficients" ,ARIZONA_EQ2_3 ,19 ), -SOC_SINGLE ("EQ2 Mode Switch" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ2 Coefficients" ,ARIZONA_EQ2_2 ),SOC_SINGLE_TLV ("EQ2 B1 Volume" ,ARIZONA_EQ2_1 ,ARIZONA_EQ2_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ2 B2 Volume", ARIZONA_EQ2_1, ARIZONA_EQ2_B2_GAIN_SHIFT,
@@ -200,8 +198,7 @@ SOC_SINGLE_TLV("EQ2 B4 Volume", ARIZONA_EQ2_2, ARIZONA_EQ2_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ2 B5 Volume" ,ARIZONA_EQ2_2 ,ARIZONA_EQ2_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ3 Coefficients" ,ARIZONA_EQ3_3 ,19 ), -SOC_SINGLE ("EQ3 Mode Switch" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ3 Coefficients" ,ARIZONA_EQ3_2 ),SOC_SINGLE_TLV ("EQ3 B1 Volume" ,ARIZONA_EQ3_1 ,ARIZONA_EQ3_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ3 B2 Volume", ARIZONA_EQ3_1, ARIZONA_EQ3_B2_GAIN_SHIFT,
@@ -213,8 +210,7 @@ SOC_SINGLE_TLV("EQ3 B4 Volume", ARIZONA_EQ3_2, ARIZONA_EQ3_B4_GAIN_SHIFT,SOC_SINGLE_TLV ("EQ3 B5 Volume" ,ARIZONA_EQ3_2 ,ARIZONA_EQ3_B5_GAIN_SHIFT ,24 ,0 , eq_tlv), -SND_SOC_BYTES ("EQ4 Coefficients" ,ARIZONA_EQ4_3 ,19 ), -SOC_SINGLE ("EQ4 Mode Switch" ,ARIZONA_EQ4_2 ,ARIZONA_EQ4_B1_MODE ,1 ,0 ), +ARIZONA_EQ_CONTROL ("EQ4 Coefficients" ,ARIZONA_EQ4_2 ),SOC_SINGLE_TLV ("EQ4 B1 Volume" ,ARIZONA_EQ4_1 ,ARIZONA_EQ4_B1_GAIN_SHIFT ,24 ,0 , eq_tlv), SOC_SINGLE_TLV("EQ4 B2 Volume", ARIZONA_EQ4_1, ARIZONA_EQ4_B2_GAIN_SHIFT,
Signature · 1 line
2.1.4