ASoC: arizona: Add volume ramp controls
Subsystems (3)
PATCH 1/3 ASoC: arizona: Add volume ramp controls
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/arizona.c | 25 +++++++++++++++++++++++++ sound/soc/codecs/arizona.h | 6 ++++++ 2 files changed, 31 insertions(+)
sound/soc/codecs/arizona.c +25 -0
@@ -274,6 +274,31 @@ EXPORT_SYMBOL_GPL(arizona_mixer_values); const DECLARE_TLV_DB_SCALE(arizona_mixer_tlv, -3200, 100, 0);EXPORT_SYMBOL_GPL (arizona_mixer_tlv); +static const char *arizona_vol_ramp_text[] = { +"0ms/6dB" ,"0.5ms/6dB" ,"1ms/6dB" ,"2ms/6dB" ,"4ms/6dB" ,"8ms/6dB" , +"15ms/6dB" ,"30ms/6dB" , +}; + +const struct soc_enum arizona_in_vd_ramp = +SOC_ENUM_SINGLE (ARIZONA_INPUT_VOLUME_RAMP , +ARIZONA_IN_VD_RAMP_SHIFT ,7 , arizona_vol_ramp_text); +EXPORT_SYMBOL_GPL (arizona_in_vd_ramp); + +const struct soc_enum arizona_in_vi_ramp = +SOC_ENUM_SINGLE (ARIZONA_INPUT_VOLUME_RAMP , +ARIZONA_IN_VI_RAMP_SHIFT ,7 , arizona_vol_ramp_text); +EXPORT_SYMBOL_GPL (arizona_in_vi_ramp); + +const struct soc_enum arizona_out_vd_ramp = +SOC_ENUM_SINGLE (ARIZONA_OUTPUT_VOLUME_RAMP , +ARIZONA_OUT_VD_RAMP_SHIFT ,7 , arizona_vol_ramp_text); +EXPORT_SYMBOL_GPL (arizona_out_vd_ramp); + +const struct soc_enum arizona_out_vi_ramp = +SOC_ENUM_SINGLE (ARIZONA_OUTPUT_VOLUME_RAMP , +ARIZONA_OUT_VI_RAMP_SHIFT ,7 , arizona_vol_ramp_text); +EXPORT_SYMBOL_GPL (arizona_out_vi_ramp); +static const char *arizona_lhpf_mode_text[] = {"Low-pass" ,"High-pass" };
sound/soc/codecs/arizona.h +6 -0
@@ -165,6 +165,12 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];ARIZONA_MIXER_ROUTES (name, name"L" ), \ ARIZONA_MIXER_ROUTES(name, name "R") +extern const struct soc_enum arizona_in_vi_ramp; +extern const struct soc_enum arizona_in_vd_ramp; + +extern const struct soc_enum arizona_out_vi_ramp; +extern const struct soc_enum arizona_out_vd_ramp; +extern const struct soc_enum arizona_lhpf1_mode;extern const struct soc_enum arizona_lhpf2_mode;extern const struct soc_enum arizona_lhpf3_mode;
Signature · 1 line
1.7.10.4
PATCH 1/1 ASoC: wm8994: Check jack is inserted when handling mic IRQ
If we've got jack detection support then check that the jack is still inserted when handling a mic IRQ in order to avoid transient reports caused by shorts during the removal process as the two interrupts race with each other.
Change-Id Ie4d032b0d37b14997b0431328ab46923fe2cdca0
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
sound/soc/codecs/wm8994.c +13 -1
@@ -3730,7 +3730,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) {struct wm8994_priv *wm8994 = data;struct snd_soc_codec *codec = wm8994->codec; -int reg, count; +int reg, count, ret;/* * Jack detection may have detected a removal simulataneously
@@ -3771,6 +3771,18 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)trace_snd_soc_jack_irq (dev_name (codec->dev));#endif +/* Avoid a transient report when the accessory is being removed */ +if (wm8994->jackdet) { + ret =snd_soc_read (codec,WM1811_JACKDET_CTRL ); +if (ret <0 ) { +dev_err (codec->dev,"Failed to read jack status: %d\n" , + ret); + }else if (!(ret &WM1811_JACKDET_LVL )) { +dev_dbg (codec->dev,"Ignoring removed jack\n" ); +return IRQ_HANDLED ; + } + } +if (wm8994->mic_detecting)wm8958_mic_id (codec, reg);else
Signature · 1 line
1.7.10.4
PATCH 2/3 ASoC: wm5102: Enable volume ramp control
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5102.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/codecs/wm5102.c +6 -0
@@ -638,6 +638,9 @@ SOC_DOUBLE_R_TLV("IN3 Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_3L, ARIZONA_ADC_DIGITAL_VOLUME_3R, ARIZONA_IN3L_DIG_VOL_SHIFT, 0xbf, 0, digital_tlv), +SOC_ENUM ("Input Ramp Up" , arizona_in_vi_ramp), +SOC_ENUM ("Input Ramp Down" , arizona_in_vd_ramp), +ARIZONA_MIXER_CONTROLS ("EQ1" ,ARIZONA_EQ1MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ2" ,ARIZONA_EQ2MIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),
@@ -765,6 +768,9 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L, ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT, 0xbf, 0, digital_tlv), +SOC_ENUM ("Output Ramp Up" , arizona_out_vi_ramp), +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),
Signature · 1 line
1.7.10.4
PATCH 3/3 ASoC: wm5110: Enable volume ramp control
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/arizona.c | 25 ------------------------- sound/soc/codecs/wm5110.c | 6 ++++++ 2 files changed, 6 insertions(+), 25 deletions(-)
sound/soc/codecs/arizona.c +0 -25
@@ -274,31 +274,6 @@ EXPORT_SYMBOL_GPL(arizona_mixer_values); const DECLARE_TLV_DB_SCALE(arizona_mixer_tlv, -3200, 100, 0);EXPORT_SYMBOL_GPL (arizona_mixer_tlv); -static const char *arizona_vol_ramp_text[] = { -"0ms/6dB" ,"0.5ms/6dB" ,"1ms/6dB" ,"2ms/6dB" ,"4ms/6dB" ,"8ms/6dB" , -"15ms/6dB" ,"30ms/6dB" , -}; - -const struct soc_enum arizona_in_vd_ramp = -SOC_ENUM_SINGLE (ARIZONA_INPUT_VOLUME_RAMP , -ARIZONA_IN_VD_RAMP_SHIFT ,7 , arizona_vol_ramp_text); -EXPORT_SYMBOL_GPL (arizona_in_vd_ramp); - -const struct soc_enum arizona_in_vi_ramp = -SOC_ENUM_SINGLE (ARIZONA_INPUT_VOLUME_RAMP , -ARIZONA_IN_VI_RAMP_SHIFT ,7 , arizona_vol_ramp_text); -EXPORT_SYMBOL_GPL (arizona_in_vi_ramp); - -const struct soc_enum arizona_out_vd_ramp = -SOC_ENUM_SINGLE (ARIZONA_OUTPUT_VOLUME_RAMP , -ARIZONA_OUT_VD_RAMP_SHIFT ,7 , arizona_vol_ramp_text); -EXPORT_SYMBOL_GPL (arizona_out_vd_ramp); - -const struct soc_enum arizona_out_vi_ramp = -SOC_ENUM_SINGLE (ARIZONA_OUTPUT_VOLUME_RAMP , -ARIZONA_OUT_VI_RAMP_SHIFT ,7 , arizona_vol_ramp_text); -EXPORT_SYMBOL_GPL (arizona_out_vi_ramp); -static const char *arizona_lhpf_mode_text[] = {"Low-pass" ,"High-pass" };
sound/soc/codecs/wm5110.c +6 -0
@@ -87,6 +87,9 @@ SOC_DOUBLE_R_TLV("IN4 Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_4L, ARIZONA_ADC_DIGITAL_VOLUME_4R, ARIZONA_IN4L_DIG_VOL_SHIFT, 0xbf, 0, digital_tlv), +SOC_ENUM ("Input Ramp Up" , arizona_in_vi_ramp), +SOC_ENUM ("Input Ramp Down" , arizona_in_vd_ramp), +ARIZONA_MIXER_CONTROLS ("EQ1" ,ARIZONA_EQ1MIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("EQ2" ,ARIZONA_EQ2MIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),
@@ -260,6 +263,9 @@ SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT,SOC_DOUBLE ("SPKDAT2 Switch" ,ARIZONA_PDM_SPK2_CTRL_1 ,ARIZONA_SPK2L_MUTE_SHIFT ,ARIZONA_SPK2R_MUTE_SHIFT ,1 ,1 ), +SOC_ENUM ("Output Ramp Up" , arizona_out_vi_ramp), +SOC_ENUM ("Output Ramp Down" , arizona_out_vd_ramp), +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