ASoC: arizona: Add noise gate hold time enumeration
Subsystems (3)
PATCH 1/3 ASoC: arizona: Add noise gate hold time enumeration
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/arizona.c | 9 +++++++++ sound/soc/codecs/arizona.h | 2 ++ 2 files changed, 11 insertions(+)
sound/soc/codecs/arizona.c +9 -0
@@ -323,6 +323,15 @@ const struct soc_enum arizona_lhpf4_mode = arizona_lhpf_mode_text);EXPORT_SYMBOL_GPL (arizona_lhpf4_mode); +static const char *arizona_ng_hold_text[] = { +"30ms" ,"120ms" ,"250ms" ,"500ms" , +}; + +const struct soc_enum arizona_ng_hold = +SOC_ENUM_SINGLE (ARIZONA_NOISE_GATE_CONTROL ,ARIZONA_NGATE_HOLD_SHIFT , +4 , arizona_ng_hold_text); +EXPORT_SYMBOL_GPL (arizona_ng_hold); +int arizona_in_ev (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/codecs/arizona.h +2 -0
@@ -176,6 +176,8 @@ extern const struct soc_enum arizona_lhpf2_mode;extern const struct soc_enum arizona_lhpf3_mode;extern const struct soc_enum arizona_lhpf4_mode; +extern const struct soc_enum arizona_ng_hold; +extern int arizona_in_ev (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event);
Signature · 1 line
1.7.10.4
PATCH 2/3 ASoC: wm5102: Add noise gate control
The references used for the noise gates and parameters for their triggering are configurable, expose that to users.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5102.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
sound/soc/codecs/wm5102.c +28 -0
@@ -45,6 +45,7 @@ static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0); static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0); static DECLARE_TLV_DB_SCALE(noise_tlv, 0, 600, 0); +static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);static const struct wm_adsp_region wm5102_dsp1_regions[] = { { .type =WMFW_ADSP2_PM , .base =0x100000 },
@@ -603,6 +604,17 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,return 0 ; } +#define WM5102_NG_SRC (name, base) \ + SOC_SINGLE(name " NG HPOUT1L Switch", base, 0, 1, 0), \ + SOC_SINGLE(name " NG HPOUT1R Switch", base, 1, 1, 0), \ + SOC_SINGLE(name " NG HPOUT2L Switch", base, 2, 1, 0), \ + SOC_SINGLE(name " NG HPOUT2R Switch", base, 3, 1, 0), \ + SOC_SINGLE(name " NG EPOUT Switch", base, 4, 1, 0), \ + SOC_SINGLE(name " NG SPKOUTL Switch", base, 6, 1, 0), \ + SOC_SINGLE(name " NG SPKOUTR Switch", base, 7, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1L Switch", base, 8, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1R Switch", base, 9, 1, 0) +static const struct snd_kcontrol_new wm5102_snd_controls[] = {SOC_SINGLE ("IN1 High Performance Switch" ,ARIZONA_IN1L_CONTROL ,ARIZONA_IN1_OSR_SHIFT ,1 ,0 ),
@@ -786,6 +798,22 @@ SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),SOC_DOUBLE ("SPKDAT1 Switch" ,ARIZONA_PDM_SPK1_CTRL_1 ,ARIZONA_SPK1L_MUTE_SHIFT ,ARIZONA_SPK1R_MUTE_SHIFT ,1 ,1 ), +SOC_SINGLE ("Noise Gate Switch" ,ARIZONA_NOISE_GATE_CONTROL , +ARIZONA_NGATE_ENA_SHIFT ,1 ,0 ), +SOC_SINGLE_TLV ("Noise Gate Threshold Volume" ,ARIZONA_NOISE_GATE_CONTROL , +ARIZONA_NGATE_THR_SHIFT ,7 ,1 , ng_tlv), +SOC_ENUM ("Noise Gate Hold" , arizona_ng_hold), + +WM5102_NG_SRC ("HPOUT1L" ,ARIZONA_NOISE_GATE_SELECT_1L ), +WM5102_NG_SRC ("HPOUT1R" ,ARIZONA_NOISE_GATE_SELECT_1R ), +WM5102_NG_SRC ("HPOUT2L" ,ARIZONA_NOISE_GATE_SELECT_2L ), +WM5102_NG_SRC ("HPOUT2R" ,ARIZONA_NOISE_GATE_SELECT_2R ), +WM5102_NG_SRC ("EPOUT" ,ARIZONA_NOISE_GATE_SELECT_3L ), +WM5102_NG_SRC ("SPKOUTL" ,ARIZONA_NOISE_GATE_SELECT_4L ), +WM5102_NG_SRC ("SPKOUTR" ,ARIZONA_NOISE_GATE_SELECT_4R ), +WM5102_NG_SRC ("SPKDAT1L" ,ARIZONA_NOISE_GATE_SELECT_5L ), +WM5102_NG_SRC ("SPKDAT1R" ,ARIZONA_NOISE_GATE_SELECT_5R ), +ARIZONA_MIXER_CONTROLS ("AIF1TX1" ,ARIZONA_AIF1TX1MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("AIF1TX2" ,ARIZONA_AIF1TX2MIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("AIF1TX3", ARIZONA_AIF1TX3MIX_INPUT_1_SOURCE),
Signature · 1 line
1.7.10.4
PATCH 3/3 ASoC: wm5110: Add noise gate control
In reply to Mark BrownThe references used for the noise gates and parameters for their triggering are configurable, expose that to users.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5110.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
sound/soc/codecs/wm5110.c +34 -0
@@ -44,6 +44,21 @@ static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0); static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0); static DECLARE_TLV_DB_SCALE(noise_tlv, 0, 600, 0); +static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0); + +#define WM5110_NG_SRC (name, base) \ + SOC_SINGLE(name " NG HPOUT1L Switch", base, 0, 1, 0), \ + SOC_SINGLE(name " NG HPOUT1R Switch", base, 1, 1, 0), \ + SOC_SINGLE(name " NG HPOUT2L Switch", base, 2, 1, 0), \ + SOC_SINGLE(name " NG HPOUT2R Switch", base, 3, 1, 0), \ + SOC_SINGLE(name " NG HPOUT3L Switch", base, 4, 1, 0), \ + SOC_SINGLE(name " NG HPOUT3R Switch", base, 5, 1, 0), \ + SOC_SINGLE(name " NG SPKOUTL Switch", base, 6, 1, 0), \ + SOC_SINGLE(name " NG SPKOUTR Switch", base, 7, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1L Switch", base, 8, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT1R Switch", base, 9, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT2L Switch", base, 10, 1, 0), \ + SOC_SINGLE(name " NG SPKDAT2R Switch", base, 11, 1, 0)static const struct snd_kcontrol_new wm5110_snd_controls[] = { SOC_SINGLE("IN1 High Performance Switch", ARIZONA_IN1L_CONTROL,
@@ -281,6 +296,25 @@ SOC_DOUBLE("SPKDAT2 Switch", ARIZONA_PDM_SPK2_CTRL_1, ARIZONA_SPK2L_MUTE_SHIFT,SOC_ENUM ("Output Ramp Up" , arizona_out_vi_ramp),SOC_ENUM ("Output Ramp Down" , arizona_out_vd_ramp), +SOC_SINGLE ("Noise Gate Switch" ,ARIZONA_NOISE_GATE_CONTROL , +ARIZONA_NGATE_ENA_SHIFT ,1 ,0 ), +SOC_SINGLE_TLV ("Noise Gate Threshold Volume" ,ARIZONA_NOISE_GATE_CONTROL , +ARIZONA_NGATE_THR_SHIFT ,7 ,1 , ng_tlv), +SOC_ENUM ("Noise Gate Hold" , arizona_ng_hold), + +WM5110_NG_SRC ("HPOUT1L" ,ARIZONA_NOISE_GATE_SELECT_1L ), +WM5110_NG_SRC ("HPOUT1R" ,ARIZONA_NOISE_GATE_SELECT_1R ), +WM5110_NG_SRC ("HPOUT2L" ,ARIZONA_NOISE_GATE_SELECT_2L ), +WM5110_NG_SRC ("HPOUT2R" ,ARIZONA_NOISE_GATE_SELECT_2R ), +WM5110_NG_SRC ("HPOUT3L" ,ARIZONA_NOISE_GATE_SELECT_3L ), +WM5110_NG_SRC ("HPOUT3R" ,ARIZONA_NOISE_GATE_SELECT_3R ), +WM5110_NG_SRC ("SPKOUTL" ,ARIZONA_NOISE_GATE_SELECT_4L ), +WM5110_NG_SRC ("SPKOUTR" ,ARIZONA_NOISE_GATE_SELECT_4R ), +WM5110_NG_SRC ("SPKDAT1L" ,ARIZONA_NOISE_GATE_SELECT_5L ), +WM5110_NG_SRC ("SPKDAT1R" ,ARIZONA_NOISE_GATE_SELECT_5R ), +WM5110_NG_SRC ("SPKDAT2L" ,ARIZONA_NOISE_GATE_SELECT_6L ), +WM5110_NG_SRC ("SPKDAT2R" ,ARIZONA_NOISE_GATE_SELECT_6R ), +ARIZONA_MIXER_CONTROLS ("AIF1TX1" ,ARIZONA_AIF1TX1MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("AIF1TX2" ,ARIZONA_AIF1TX2MIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("AIF1TX3", ARIZONA_AIF1TX3MIX_INPUT_1_SOURCE),
Signature · 1 line
1.7.10.4