ASoC: tlv320aic3x: Add support for high power analog output
Subsystems (3)
PATCH v4 1/1 ASoC: tlv320aic3x: Add support for high power analog output
Add support to output level control for the analog high power output drivers HPOUT and HPCOM.
---
Notes:
Notes:
Changes in V4:
-Added separate mono playback volume control -grouped volume controls with corresponding switch
Changes in V3:
-Fixed compilation error
Changes in V2:
- Removed power control as it is handled by DAPM
- Added level control for left channel
sound/soc/codecs/tlv320aic3x.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
sound/soc/codecs/tlv320aic3x.c +13 -1
@@ -324,6 +324,9 @@ static DECLARE_TLV_DB_SCALE(adc_tlv, 0, 50, 0);*/ static DECLARE_TLV_DB_SCALE(output_stage_tlv, -5900, 50, 1); +/* Output volumes. From 0 to 9 dB in 1 dB steps */ +static const DECLARE_TLV_DB_SCALE(out_tlv, 0, 100, 0); +static const struct snd_kcontrol_new aic3x_snd_controls[] = {/* Output */ SOC_DOUBLE_R_TLV("PCM Playback Volume",
@@ -386,11 +389,17 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { DACL1_2_HPLCOM_VOL, DACR1_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv), -/* Output pin mute controls */ +/* Output pin controls */ +SOC_DOUBLE_R_TLV ("Line Playback Volume" ,LLOPM_CTRL ,RLOPM_CTRL ,4 , +9 ,0 , out_tlv),SOC_DOUBLE_R ("Line Playback Switch" ,LLOPM_CTRL ,RLOPM_CTRL ,3 ,0x01 ,0 ), +SOC_DOUBLE_R_TLV ("HP Playback Volume" ,HPLOUT_CTRL ,HPROUT_CTRL ,4 , +9 ,0 , out_tlv),SOC_DOUBLE_R ("HP Playback Switch" ,HPLOUT_CTRL ,HPROUT_CTRL ,3 ,0x01 ,0 ), +SOC_DOUBLE_R_TLV ("HPCOM Playback Volume" ,HPLCOM_CTRL ,HPRCOM_CTRL , +4 ,9 ,0 , out_tlv),SOC_DOUBLE_R ("HPCOM Playback Switch" ,HPLCOM_CTRL ,HPRCOM_CTRL ,3 , 0x01, 0),
@@ -472,6 +481,9 @@ static const struct snd_kcontrol_new aic3x_mono_controls[] = { 0, 118, 1, output_stage_tlv), SOC_SINGLE("Mono Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0), + SOC_SINGLE_TLV("Mono Playback Volume", MONOLOPM_CTRL, 4, 9, 0, + out_tlv), + };/*
Signature · 1 line
2.17.1
Dear Saravanan Sekar,
Quoted 69 lines · Saravanan Sekar
Add support to output level control for the analog high power output drivers HPOUT and HPCOM.
Signed-off-by Saravanan Sekar <[email protected]>---
Notes:
Notes:
Changes in V4:
-Added separate mono playback volume control -grouped volume controls with corresponding switchChanges in V3:
-Fixed compilation errorChanges in V2:
- Removed power control as it is handled by DAPM
- Added level control for left channelsound/soc/codecs/tlv320aic3x.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)sound/soc/codecs/tlv320aic3x.c +13
-2@@ -324,6 +324,9 @@ static DECLARE_TLV_DB_SCALE(adc_tlv, 0, 50, 0);*/ static DECLARE_TLV_DB_SCALE(output_stage_tlv, -5900, 50, 1); +/* Output volumes. From 0 to 9 dB in 1 dB steps */ +static const DECLARE_TLV_DB_SCALE(out_tlv, 0, 100, 0); +static const struct snd_kcontrol_new aic3x_snd_controls[] = {/* Output */ SOC_DOUBLE_R_TLV("PCM Playback Volume",@@ -386,11 +389,17 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { DACL1_2_HPLCOM_VOL, DACR1_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv), -/* Output pin mute controls */ +/* Output pin controls */ +SOC_DOUBLE_R_TLV ("Line Playback Volume" ,LLOPM_CTRL ,RLOPM_CTRL ,4 , +9 ,0 , out_tlv),SOC_DOUBLE_R ("Line Playback Switch" ,LLOPM_CTRL ,RLOPM_CTRL ,3 ,0x01 ,0 ), +SOC_DOUBLE_R_TLV ("HP Playback Volume" ,HPLOUT_CTRL ,HPROUT_CTRL ,4 , +9 ,0 , out_tlv),SOC_DOUBLE_R ("HP Playback Switch" ,HPLOUT_CTRL ,HPROUT_CTRL ,3 ,0x01 ,0 ), +SOC_DOUBLE_R_TLV ("HPCOM Playback Volume" ,HPLCOM_CTRL ,HPRCOM_CTRL , +4 ,9 ,0 , out_tlv),SOC_DOUBLE_R ("HPCOM Playback Switch" ,HPLCOM_CTRL ,HPRCOM_CTRL ,3 , 0x01, 0),@@ -472,6 +481,9 @@ static const struct snd_kcontrol_new aic3x_mono_controls[] = { 0, 118, 1, output_stage_tlv), SOC_SINGLE("Mono Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0), + SOC_SINGLE_TLV("Mono Playback Volume", MONOLOPM_CTRL, 4, 9, 0, + out_tlv), + };/* -- 2.17.1
Quoted 4 lines
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Best regards,
Benoît
Mark Brown
maintainerApplied "ASoC: tlv320aic3x: Add support for high power analog output" to the asoc tree
In reply to Saravanan SekarThe patch
ASoC: tlv320aic3x: Add support for high power analog output
has been applied to the asoc tree at
https://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
bfa8130f50a63563eae10ef933fe01b50b3e87a0Mon Sep 17 00:00:00 2001
From: Saravanan Sekar <[email protected]>
Date: Sat, 11 May 2019 17:11:49 +0200
Subject: [PATCH] ASoC: tlv320aic3x: Add support for high power analog output
Add support to output level control for the analog high power output drivers HPOUT and HPCOM.
--- sound/soc/codecs/tlv320aic3x.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
sound/soc/codecs/tlv320aic3x.c +13 -1
@@ -324,6 +324,9 @@ static DECLARE_TLV_DB_SCALE(adc_tlv, 0, 50, 0);*/ static DECLARE_TLV_DB_SCALE(output_stage_tlv, -5900, 50, 1); +/* Output volumes. From 0 to 9 dB in 1 dB steps */ +static const DECLARE_TLV_DB_SCALE(out_tlv, 0, 100, 0); +static const struct snd_kcontrol_new aic3x_snd_controls[] = {/* Output */ SOC_DOUBLE_R_TLV("PCM Playback Volume",
@@ -386,11 +389,17 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { DACL1_2_HPLCOM_VOL, DACR1_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv), -/* Output pin mute controls */ +/* Output pin controls */ +SOC_DOUBLE_R_TLV ("Line Playback Volume" ,LLOPM_CTRL ,RLOPM_CTRL ,4 , +9 ,0 , out_tlv),SOC_DOUBLE_R ("Line Playback Switch" ,LLOPM_CTRL ,RLOPM_CTRL ,3 ,0x01 ,0 ), +SOC_DOUBLE_R_TLV ("HP Playback Volume" ,HPLOUT_CTRL ,HPROUT_CTRL ,4 , +9 ,0 , out_tlv),SOC_DOUBLE_R ("HP Playback Switch" ,HPLOUT_CTRL ,HPROUT_CTRL ,3 ,0x01 ,0 ), +SOC_DOUBLE_R_TLV ("HPCOM Playback Volume" ,HPLCOM_CTRL ,HPRCOM_CTRL , +4 ,9 ,0 , out_tlv),SOC_DOUBLE_R ("HPCOM Playback Switch" ,HPLCOM_CTRL ,HPRCOM_CTRL ,3 , 0x01, 0),
@@ -472,6 +481,9 @@ static const struct snd_kcontrol_new aic3x_mono_controls[] = { 0, 118, 1, output_stage_tlv), SOC_SINGLE("Mono Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0), + SOC_SINGLE_TLV("Mono Playback Volume", MONOLOPM_CTRL, 4, 9, 0, + out_tlv), + };/*
Signature · 1 line
2.20.1