ASoC: arizona: Add DAC Volume Limit controls
Subsystems (5)
Charles Keepax
maintainerPATCH 1/1 ASoC: arizona: Add DAC Volume Limit controls
Add controls that allow the limiting of the volume coming from the DACs on the Arizona class devices, note that wm8998 does not have this feature.
--- sound/soc/codecs/cs47l24.c | 8 ++++++++ sound/soc/codecs/wm5102.c | 17 +++++++++++++++++ sound/soc/codecs/wm5110.c | 20 ++++++++++++++++++++ sound/soc/codecs/wm8997.c | 14 ++++++++++++++ 4 files changed, 59 insertions(+)
sound/soc/codecs/cs47l24.c +8 -0
@@ -78,6 +78,7 @@ static int cs47l24_adsp_power_ev(struct snd_soc_dapm_widget *w, 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(vol_limit_tlv, -600, 50, 0); static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0); static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
@@ -203,6 +204,13 @@ SOC_SINGLE_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L, ARIZONA_OUT4L_VOL_SHIFT, 0xbf, 0, digital_tlv), +SOC_DOUBLE_R_RANGE_TLV ("HPOUT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_1L , +ARIZONA_DAC_VOLUME_LIMIT_1R ,ARIZONA_OUT1L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("Speaker Volume Limit" ,ARIZONA_OUT_VOLUME_4L , +ARIZONA_OUT_VOLUME_4R ,ARIZONA_OUT4L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_ENUM ("Output Ramp Up" , arizona_out_vi_ramp), SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
sound/soc/codecs/wm5102.c +17 -0
@@ -42,6 +42,7 @@ struct wm5102_priv { 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(vol_limit_tlv, -600, 50, 0); static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0); static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
@@ -915,6 +916,22 @@ 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_DOUBLE_R_RANGE_TLV ("HPOUT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_1L , +ARIZONA_DAC_VOLUME_LIMIT_1R ,ARIZONA_OUT1L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("HPOUT2 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_2L , +ARIZONA_DAC_VOLUME_LIMIT_2R ,ARIZONA_OUT2L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("EPOUT Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_3L , +ARIZONA_DAC_VOLUME_LIMIT_3R ,ARIZONA_OUT3L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("Speaker Volume Limit" ,ARIZONA_OUT_VOLUME_4L , +ARIZONA_OUT_VOLUME_4R ,ARIZONA_OUT4L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("SPKDAT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_5L , +ARIZONA_DAC_VOLUME_LIMIT_5R ,ARIZONA_OUT5L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_ENUM ("HPOUT1 OSR" , wm5102_hpout_osr[0 ]),SOC_ENUM ("HPOUT2 OSR" , wm5102_hpout_osr[1 ]), SOC_ENUM("EPOUT OSR", wm5102_hpout_osr[2]),
sound/soc/codecs/wm5110.c +20 -0
@@ -575,6 +575,7 @@ static int wm5110_in_ev(struct snd_soc_dapm_widget *w, 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(vol_limit_tlv, -600, 50, 0); static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0); static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
@@ -855,6 +856,25 @@ SOC_DOUBLE_R_TLV("SPKDAT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_6L, ARIZONA_DAC_DIGITAL_VOLUME_6R, ARIZONA_OUT6L_VOL_SHIFT, 0xbf, 0, digital_tlv), +SOC_DOUBLE_R_RANGE_TLV ("HPOUT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_1L , +ARIZONA_DAC_VOLUME_LIMIT_1R ,ARIZONA_OUT1L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("HPOUT2 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_2L , +ARIZONA_DAC_VOLUME_LIMIT_2R ,ARIZONA_OUT2L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("HPOUT3 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_3L , +ARIZONA_DAC_VOLUME_LIMIT_3R ,ARIZONA_OUT3L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("Speaker Volume Limit" ,ARIZONA_OUT_VOLUME_4L , +ARIZONA_OUT_VOLUME_4R ,ARIZONA_OUT4L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("SPKDAT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_5L , +ARIZONA_DAC_VOLUME_LIMIT_5R ,ARIZONA_OUT5L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("SPKDAT2 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_6L , +ARIZONA_DAC_VOLUME_LIMIT_6R ,ARIZONA_OUT6L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE ("SPKDAT1 Switch" ,ARIZONA_PDM_SPK1_CTRL_1 ,ARIZONA_SPK1L_MUTE_SHIFT ,ARIZONA_SPK1R_MUTE_SHIFT ,1 ,1 ), SOC_DOUBLE("SPKDAT2 Switch", ARIZONA_PDM_SPK2_CTRL_1, ARIZONA_SPK2L_MUTE_SHIFT,
sound/soc/codecs/wm8997.c +14 -0
@@ -40,6 +40,7 @@ struct wm8997_priv { 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(vol_limit_tlv, -600, 50, 0); static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0); static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
@@ -287,6 +288,19 @@ 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_DOUBLE_R_RANGE_TLV ("HPOUT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_1L , +ARIZONA_DAC_VOLUME_LIMIT_1R ,ARIZONA_OUT1L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("EPOUT Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_3L , +ARIZONA_DAC_VOLUME_LIMIT_3R ,ARIZONA_OUT3L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("Speaker Volume Limit" ,ARIZONA_OUT_VOLUME_4L , +ARIZONA_OUT_VOLUME_4R ,ARIZONA_OUT4L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_DOUBLE_R_RANGE_TLV ("SPKDAT1 Volume Limit" ,ARIZONA_DAC_VOLUME_LIMIT_5L , +ARIZONA_DAC_VOLUME_LIMIT_5R ,ARIZONA_OUT5L_VOL_LIM_SHIFT , +0x74 ,0x8C ,0 , vol_limit_tlv), +SOC_ENUM ("HPOUT1 OSR" , wm8997_hpout_osr[0 ]), SOC_ENUM("EPOUT OSR", wm8997_hpout_osr[1]),
Signature · 1 line
2.11.0
Mark Brown
maintainerQuoted 2 lines · Charles Keepax
Add controls that allow the limiting of the volume coming from the DACs on the Arizona class devices, note that wm8998 does not have this feature.
Is it sensible to control the volume limits through normal controls given that the level of protection offered ends up being minimal if the two controls are sitting next to each other? I'd kind of expect this to be something that comes from the system integration (eg, limits on the physical capabilities of the speaker).
Charles Keepax
maintainerQuoted 9 lines · Mark Brown
Quoted 2 lines · Charles Keepax
Add controls that allow the limiting of the volume coming from the DACs on the Arizona class devices, note that wm8998 does not have this feature.
Is it sensible to control the volume limits through normal controls given that the level of protection offered ends up being minimal if the two controls are sitting next to each other? I'd kind of expect this to be something that comes from the system integration (eg, limits on the physical capabilities of the speaker).
That is a fair point, I don't think we have any need to adapt them dynamically so I could move them to a DT binding/pdata. I will have a look at that.
Thanks,
Charles