ASoC: lm49453: Fix adc, mic and sidetone volume ranges
Subsystems (3)
[email protected]
maintainerPATCH v2 1/1 ASoC: lm49453: Fix adc, mic and sidetone volume ranges
Add adc, mic, sidetone volume ranges and appropriately added the controls. Fix the DAC HP/EP/LS/LO/HA maximum gain values.
--
sound/soc/codecs/lm49453.c | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-)
sound/soc/codecs/lm49453.c +24 -19
@@ -494,36 +494,41 @@ SOC_DAPM_SINGLE("Port2_2 Switch", LM49453_P0_PORT2_TX2_REG, 7, 1, 0), };/* TLV Declarations */ -static const DECLARE_TLV_DB_SCALE(digital_tlv, -7650, 150, 1); -static const DECLARE_TLV_DB_SCALE(port_tlv, 0, 600, 0); +static const DECLARE_TLV_DB_SCALE(adc_dac_tlv, -7650, 150, 1); +static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 200, 1); +static const DECLARE_TLV_DB_SCALE(port_tlv, -1800, 600, 0); +static const DECLARE_TLV_DB_SCALE(stn_tlv, -7200, 150, 0);static const struct snd_kcontrol_new lm49453_sidetone_mixer_controls[] = {/* Sidetone supports mono only */ SOC_DAPM_SINGLE_TLV ("Sidetone ADCL Volume" ,LM49453_P0_STN_VOL_ADCL_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone ADCR Volume" ,LM49453_P0_STN_VOL_ADCR_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC1L Volume" ,LM49453_P0_STN_VOL_DMIC1L_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC1R Volume" ,LM49453_P0_STN_VOL_DMIC1R_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC2L Volume" ,LM49453_P0_STN_VOL_DMIC2L_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC2R Volume" ,LM49453_P0_STN_VOL_DMIC2R_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv), };static const struct snd_kcontrol_new lm49453_snd_controls[] = {/* mic1 and mic2 supports mono only */ -SOC_SINGLE_TLV ("Mic1 Volume" ,LM49453_P0_ADC_LEVELL_REG ,0 ,6 , -0 , digital_tlv), -SOC_SINGLE_TLV ("Mic2 Volume" ,LM49453_P0_ADC_LEVELR_REG ,0 ,6 , -0 , digital_tlv), +SOC_SINGLE_TLV ("Mic1 Volume" ,LM49453_P0_MICL_REG ,0 ,15 ,0 , mic_tlv), +SOC_SINGLE_TLV ("Mic2 Volume" ,LM49453_P0_MICR_REG ,0 ,15 ,0 , mic_tlv), + +SOC_SINGLE_TLV ("ADCL Volume" ,LM49453_P0_ADC_LEVELL_REG ,0 ,63 , +0 , adc_dac_tlv), +SOC_SINGLE_TLV ("ADCR Volume" ,LM49453_P0_ADC_LEVELR_REG ,0 ,63 , +0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DMIC1 Volume" ,LM49453_P0_DMIC1_LEVELL_REG , -LM49453_P0_DMIC1_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DMIC1_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DMIC2 Volume" ,LM49453_P0_DMIC2_LEVELL_REG , -LM49453_P0_DMIC2_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DMIC2_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DAPM_ENUM ("Mic2Mode" , lm49453_mic2mode_enum),SOC_DAPM_ENUM ("DMIC12 SRC" , lm49453_dmic12_cfg_enum),
@@ -538,16 +543,16 @@ static const struct snd_kcontrol_new lm49453_snd_controls[] = { 2, 1, 0),SOC_DOUBLE_R_TLV ("DAC HP Volume" ,LM49453_P0_DAC_HP_LEVELL_REG , -LM49453_P0_DAC_HP_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_HP_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DAC LO Volume" ,LM49453_P0_DAC_LO_LEVELL_REG , -LM49453_P0_DAC_LO_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_LO_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DAC LS Volume" ,LM49453_P0_DAC_LS_LEVELL_REG , -LM49453_P0_DAC_LS_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_LS_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DAC HA Volume" ,LM49453_P0_DAC_HA_LEVELL_REG , -LM49453_P0_DAC_HA_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_HA_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_SINGLE_TLV ("EP Volume" ,LM49453_P0_DAC_LS_LEVELL_REG , -0 ,6 ,0 , digital_tlv), +0 ,63 ,0 , adc_dac_tlv),SOC_SINGLE_TLV ("PORT1_1_RX_LVL Volume" ,LM49453_P0_PORT1_RX_LVL1_REG , 0, 3, 0, port_tlv),
Quoted 15 lines · On Fri, 2012-12-07 at 17:00 +0530, [email protected] wrote:
Add adc, mic, sidetone volume ranges and appropriately added the controls. Fix the DAC HP/EP/LS/LO/HA maximum gain values.
Signed-off-by MR Swami Reddy <[email protected]>--
sound/soc/codecs/lm49453.c | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-)sound/soc/codecs/lm49453.c +0
-0
sound/soc/codecs/lm49453.c SOC_DAPM_SINGLE("Port2_2 Switch", LM49453_P0_PORT2_TX2_REG, 7, 1, 0), · line 496
Quoted 3 lines
sound/soc/codecs/lm49453.c +0
-0@@ -494,36 +494,41 @@ SOC_DAPM_SINGLE("Port2_2 Switch", LM49453_P0_PORT2_TX2_REG, 7, 1, 0), };/* TLV Declarations */
You have confused the meanings of TLV #define DECLARE_TLV_DB_SCALE(name, min, step, mute)
sound/soc/codecs/lm49453.c SOC_DAPM_SINGLE("Port2_2 Switch", LM49453_P0_PORT2_TX2_REG, 7, 1, 0), · line 497
Quoted 3 lines
sound/soc/codecs/lm49453.c +1
-2-static const DECLARE_TLV_DB_SCALE(digital_tlv, -7650, 150, 1); -static const DECLARE_TLV_DB_SCALE(port_tlv, 0, 600, 0); +static const DECLARE_TLV_DB_SCALE(adc_dac_tlv, -7650, 150, 1);
step is right here, but MAX shows up as 63 and not 18dB and where is mute here. You have separate bit for mute!
sound/soc/codecs/lm49453.c SOC_DAPM_SINGLE("Port2_2 Switch", LM49453_P0_PORT2_TX2_REG, 7, 1, 0), · line 498
Quoted 1 line
sound/soc/codecs/lm49453.c +1
-0+static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 200, 1);
step is NOT 2dB but 10dB, and where do we have mute here
Please test these before posting
Quoted 74 lines
sound/soc/codecs/lm49453.c +22
-17+static const DECLARE_TLV_DB_SCALE(port_tlv, -1800, 600, 0); +static const DECLARE_TLV_DB_SCALE(stn_tlv, -7200, 150, 0);static const struct snd_kcontrol_new lm49453_sidetone_mixer_controls[] = {/* Sidetone supports mono only */ SOC_DAPM_SINGLE_TLV ("Sidetone ADCL Volume" ,LM49453_P0_STN_VOL_ADCL_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone ADCR Volume" ,LM49453_P0_STN_VOL_ADCR_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC1L Volume" ,LM49453_P0_STN_VOL_DMIC1L_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC1R Volume" ,LM49453_P0_STN_VOL_DMIC1R_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC2L Volume" ,LM49453_P0_STN_VOL_DMIC2L_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv),SOC_DAPM_SINGLE_TLV ("Sidetone DMIC2R Volume" ,LM49453_P0_STN_VOL_DMIC2R_REG , -0 ,0x3F ,0 , digital_tlv), +0 ,0x3F ,0 , stn_tlv), };static const struct snd_kcontrol_new lm49453_snd_controls[] = {/* mic1 and mic2 supports mono only */ -SOC_SINGLE_TLV ("Mic1 Volume" ,LM49453_P0_ADC_LEVELL_REG ,0 ,6 , -0 , digital_tlv), -SOC_SINGLE_TLV ("Mic2 Volume" ,LM49453_P0_ADC_LEVELR_REG ,0 ,6 , -0 , digital_tlv), +SOC_SINGLE_TLV ("Mic1 Volume" ,LM49453_P0_MICL_REG ,0 ,15 ,0 , mic_tlv), +SOC_SINGLE_TLV ("Mic2 Volume" ,LM49453_P0_MICR_REG ,0 ,15 ,0 , mic_tlv), + +SOC_SINGLE_TLV ("ADCL Volume" ,LM49453_P0_ADC_LEVELL_REG ,0 ,63 , +0 , adc_dac_tlv), +SOC_SINGLE_TLV ("ADCR Volume" ,LM49453_P0_ADC_LEVELR_REG ,0 ,63 , +0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DMIC1 Volume" ,LM49453_P0_DMIC1_LEVELL_REG , -LM49453_P0_DMIC1_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DMIC1_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DMIC2 Volume" ,LM49453_P0_DMIC2_LEVELL_REG , -LM49453_P0_DMIC2_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DMIC2_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DAPM_ENUM ("Mic2Mode" , lm49453_mic2mode_enum),SOC_DAPM_ENUM ("DMIC12 SRC" , lm49453_dmic12_cfg_enum),@@ -538,16 +543,16 @@ static const struct snd_kcontrol_new lm49453_snd_controls[] = { 2, 1, 0),SOC_DOUBLE_R_TLV ("DAC HP Volume" ,LM49453_P0_DAC_HP_LEVELL_REG , -LM49453_P0_DAC_HP_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_HP_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DAC LO Volume" ,LM49453_P0_DAC_LO_LEVELL_REG , -LM49453_P0_DAC_LO_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_LO_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DAC LS Volume" ,LM49453_P0_DAC_LS_LEVELL_REG , -LM49453_P0_DAC_LS_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_LS_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_DOUBLE_R_TLV ("DAC HA Volume" ,LM49453_P0_DAC_HA_LEVELL_REG , -LM49453_P0_DAC_HA_LEVELR_REG ,0 ,6 ,0 , digital_tlv), +LM49453_P0_DAC_HA_LEVELR_REG ,0 ,63 ,0 , adc_dac_tlv),SOC_SINGLE_TLV ("EP Volume" ,LM49453_P0_DAC_LS_LEVELL_REG , -0 ,6 ,0 , digital_tlv), +0 ,63 ,0 , adc_dac_tlv),SOC_SINGLE_TLV ("PORT1_1_RX_LVL Volume" ,LM49453_P0_PORT1_RX_LVL1_REG , 0, 3, 0, port_tlv),_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Signature · 1 line
~Vinod
Vinod Koul
Tested-byQuoted 10 lines · Vinod Koul
You have confused the meanings of TLV #define
DECLARE_TLV_DB_SCALE(name, min, step, mute)sound/soc/codecs/lm49453.c SOC_DAPM_SINGLE("Port2_2 Switch", LM49453_P0_PORT2_TX2_REG, 7, 1, 0), · line 497
Quoted 3 lines
sound/soc/codecs/lm49453.c +1
-2-static const DECLARE_TLV_DB_SCALE(digital_tlv, -7650, 150, 1); -static const DECLARE_TLV_DB_SCALE(port_tlv, 0, 600, 0); +static const DECLARE_TLV_DB_SCALE(adc_dac_tlv, -7650, 150, 1);step is right here, but MAX shows up as 63 and not 18dB and where is mute here. You have separate bit for mute!
Quoted 1 line
+static const
DECLARE_TLV_DB_SCALE(mic_tlv, 0, 200, 1);step is NOT 2dB but 10dB, and where do we have mute here
Sorry I mis read data sheet, this is fine. We have 2dB steps
I have tested both of these so:
Only mute bits need to be fixed here and we should be good
Signature · 1 line
~Vinod
MR Swami Reddy
maintainerQuoted 7 lines · Vinod Koul
Quoted 2 lines · Vinod Koul
Quoted 1 line
+static const
DECLARE_TLV_DB_SCALE(mic_tlv, 0, 200, 1);step is NOT 2dB but 10dB, and where do we have mute here
Sorry I mis read data sheet, this is fine. We have 2dB steps
I have tested both of these so:
Tested-by Vinod Koul <[email protected]>
Thanks for validation.
Quoted 2 lines
Only mute bits need to be fixed here and we should be good
LM49453 codec has a separate bit for MUTE operation.
Thanks
Swami
Mark Brown
AppliedQuoted 2 lines · On Fri, Dec 07, 2012 at 05:00:10PM +0530, [email protected] wrote:
Add adc, mic, sidetone volume ranges and appropriately added the controls. Fix the DAC HP/EP/LS/LO/HA maximum gain values.
Applied, thanks.