ASoC: alc5632: rename volume/switch contols for master and speaker volumes.
PATCH 1/1 ASoC: alc5632: rename volume/switch contols for master and speaker volumes.
From: Andrey Danin <[email protected]>
--- sound/soc/codecs/alc5632.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/alc5632.c +4 -4
@@ -144,10 +144,10 @@ static const DECLARE_TLV_DB_SCALE(vdac_tlv, -3525, 075, 0);static const struct snd_kcontrol_new alc5632_vol_snd_controls[] = {/* left starts at bit 8, right at bit 0 */ /* 31 steps (5 bit), -46.5db scale */ -SOC_DOUBLE_TLV ("Line Playback Volume" , +SOC_DOUBLE_TLV ("Speaker Playback Volume" ,ALC5632_SPK_OUT_VOL ,8 ,0 ,31 ,1 , hp_tlv),/* bit 15 mutes left, bit 7 right */ -SOC_DOUBLE ("Line Playback Switch" , +SOC_DOUBLE ("Speaker Playback Switch" ,ALC5632_SPK_OUT_VOL ,15 ,7 ,1 ,1 ),SOC_DOUBLE_TLV ("Headphone Playback Volume" ,ALC5632_HP_OUT_VOL ,8 ,0 ,31 ,1 , hp_tlv),
@@ -166,9 +166,9 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = { ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv),SOC_DOUBLE_TLV ("LineIn Capture Volume" ,ALC5632_LINE_IN_VOL ,8 ,0 ,31 ,1 , vol_tlv), -SOC_DOUBLE_TLV ("Stereo DAC Playback Volume" , +SOC_DOUBLE_TLV ("Master Playback Volume" ,ALC5632_STEREO_DAC_IN_VOL ,8 ,0 ,63 ,1 , vdac_tlv), -SOC_DOUBLE ("Stereo DAC Playback Switch" , +SOC_DOUBLE ("Master Playback Switch" ,ALC5632_STEREO_DAC_IN_VOL ,15 ,7 ,1 ,1 ),SOC_SINGLE_TLV ("Mic1 Capture Volume" , ALC5632_MIC_VOL, 8, 31, 1, vol_tlv),
Signature · 1 line
1.7.4.4
sound/soc/codecs/alc5632.c static const DECLARE_TLV_DB_SCALE(vdac_tlv, -3525, 075, 0); · line 148
Quoted 3 lines · Leon Romanovsky
sound/soc/codecs/alc5632.c +1
-1-SOC_DOUBLE_TLV ("Line Playback Volume" , +SOC_DOUBLE_TLV ("Speaker Playback Volume" , ALC5632_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv),
This looks really suspicious, why are we renaming the line output as a speaker output? This might be appropriate on your board but if the drivers aren't part of the CODEC it might not be appropriate on another board.
sound/soc/codecs/alc5632.c static const struct snd_kcontrol_new alc5632_snd_controls[] = { · line 171
Quoted 6 lines
sound/soc/codecs/alc5632.c +2
-2ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv), -SOC_DOUBLE_TLV ("Stereo DAC Playback Volume" , +SOC_DOUBLE_TLV ("Master Playback Volume" ,ALC5632_STEREO_DAC_IN_VOL ,8 ,0 ,63 ,1 , vdac_tlv), - SOC_DOUBLE("Stereo DAC Playback Switch", + SOC_DOUBLE("Master Playback Switch",
This looks fine.
Quoted 10 lines · Mark Brown
Quoted 3 lines · Leon Romanovsky
- SOC_DOUBLE_TLV("Line Playback Volume",
+SOC_DOUBLE_TLV("Speaker Playback Volume", ALC5632_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv),This looks really suspicious, why are we renaming the line output as a speaker output? This might be appropriate on your board but if the drivers aren't part of the CODEC it might not be appropriate on another board.
There are two main reasons:
1) We are changing SPK_OUT_VOL which on the schematics marked as a speaker, and we want to be as close as possible to the datasheet.
2) We are tired to explain to users that the speaker volume controlled by "Line Playback Volume" in alsamixer.
Quoted 10 lines
Quoted 7 lines
ALC5632_LINE_IN_VOL, 8, 0, 31, 1,vol_tlv),
- SOC_DOUBLE_TLV("Stereo DAC Playback Volume",
+SOC_DOUBLE_TLV("Master Playback Volume", ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv),
- SOC_DOUBLE("Stereo DAC Playback Switch",
+ SOC_DOUBLE("Master Playback Switch",This looks fine.
Signature · 6 lines
Leon Romanovsky | Independent Linux Consultant www.leon.nu | [email protected] _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 7 lines · Leon Romanovsky
On Mon, Nov 14, 2011 at 23:39, Mark Brown
Quoted 4 lines
This looks really suspicious, why are we renaming the line output as a speaker output? This might be appropriate on your board but if the drivers aren't part of the CODEC it might not be appropriate on another board.
Quoted 5 lines
There are two main reasons:
1) We are changingSPK_OUT_VOLwhich on the schematics marked as a speaker, and we want to be as close as possible to the datasheet.
2) We are tired to explain to users that the speaker volume controlled by "Line Playback Volume" in alsamixer.
The above both sound board specific. What does the CODEC itself call these outputs?
Quoted 8 lines · Mark Brown
Quoted 6 lines · Leon Romanovsky
On Mon, Nov 14, 2011 at 23:39, Mark Brown
Quoted 4 lines
This looks really suspicious, why are we renaming the line output as a speaker output? This might be appropriate on your board but if the drivers aren't part of the CODEC it might not be appropriate on another board.
Quoted 8 lines
Quoted 5 lines
There are two main reasons:
1) We are changingSPK_OUT_VOLwhich on the schematics marked as a speaker, and we want to be as close as possible to the datasheet.
2) We are tired to explain to users that the speaker volume controlled by "Line Playback Volume" in alsamixer.The above both sound board specific. What does the CODEC itself call these outputs?
SPK_OUT/SPK_OUTN
http://ac100.wikispaces.com/file/view/alc5632_mixer_path.PNG/251095266/alc5632_mixer_path.PNG
Signature · 6 lines
Leon Romanovsky | Independent Linux Consultant www.leon.nu | [email protected] _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 1 line · Leon Romanovsky
SPK_OUT/SPK_OUTN
OK, applied thanks.