Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b753e03e5e7c6ee60e81cd6335c80dc26519f9d0

Authored by Krzysztof Helt
Committed by Takashi Iwai
1 parent baac805fc5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ALSA: cs4236: update control names 

Update control names to be more closer to their meaning.
Change the "Mono" name to the "Beep" as this line is usually
used to forward the PC beeper signal to sound card's output.
Update names for both cs423x and wss.

Clean up cs4235 controls according to the cs4235 doc. Rename
some of the cs4235 controls to be consistent with the cs4236's
ones.

Also, delete one misnamed cs4231 register define.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 3 changed files with 25 additions and 33 deletions Side-by-side Diff

include/sound/cs4231-regs.h
Diff comments   View file @ b753e03
... ... @@ -70,7 +70,6 @@
70 70 #define AD1845_PWR_DOWN 0x1b /* power down control */
71 71 #define CS4235_LEFT_MASTER 0x1b /* left master output control */
72 72 #define CS4231_REC_FORMAT 0x1c /* clock and data format - record - bits 7-0 MCE */
73   -#define CS4231_PLY_VAR_FREQ 0x1d /* playback variable frequency */
74 73 #define AD1845_CLOCK 0x1d /* crystal clock select and total power down */
75 74 #define CS4235_RIGHT_MASTER 0x1d /* right master output control */
76 75 #define CS4231_REC_UPR_CNT 0x1e /* record upper count */
sound/isa/cs423x/cs4236_lib.c
Diff comments   View file @ b753e03
... ... @@ -777,7 +777,7 @@
777 777 CS4236_DOUBLE("Mic Capture Switch", 0,
778 778 CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 7, 7, 1, 1),
779 779 CS4236_DOUBLE("Mic Volume", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 0, 0, 31, 1),
780   -CS4236_DOUBLE("Mic Playback Boost", 0,
  780 +CS4236_DOUBLE("Mic Playback Boost (+20dB)", 0,
781 781 CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 5, 5, 1, 0),
782 782  
783 783 WSS_DOUBLE("Line Playback Switch", 0,
784 784  
... ... @@ -798,10 +798,10 @@
798 798  
799 799 CS4236_DOUBLE1("Mono Output Playback Switch", 0,
800 800 CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1),
801   -CS4236_DOUBLE1("Mono Playback Switch", 0,
  801 +CS4236_DOUBLE1("Beep Playback Switch", 0,
802 802 CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1),
803   -WSS_SINGLE("Mono Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1),
804   -WSS_SINGLE("Mono Playback Bypass", 0, CS4231_MONO_CTRL, 5, 1, 0),
  803 +WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1),
  804 +WSS_SINGLE("Beep Bypass Playback Switch", 0, CS4231_MONO_CTRL, 5, 1, 0),
805 805  
806 806 WSS_DOUBLE("Capture Volume", 0,
807 807 CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0, 15, 0),
808 808  
809 809  
810 810  
811 811  
812 812  
813 813  
... ... @@ -815,31 +815,27 @@
815 815  
816 816 static struct snd_kcontrol_new snd_cs4235_controls[] = {
817 817  
818   -WSS_DOUBLE("Master Switch", 0,
  818 +WSS_DOUBLE("Master Playback Switch", 0,
819 819 CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 7, 7, 1, 1),
820   -WSS_DOUBLE("Master Volume", 0,
  820 +WSS_DOUBLE("Master Playback Volume", 0,
821 821 CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 0, 0, 31, 1),
822 822  
823 823 CS4235_OUTPUT_ACCU("Playback Volume", 0),
824 824  
825   -CS4236_DOUBLE("Master Digital Playback Switch", 0,
826   - CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1),
827   -CS4236_DOUBLE("Master Digital Capture Switch", 0,
828   - CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1),
829   -CS4236_MASTER_DIGITAL("Master Digital Volume", 0),
830   -
831   -WSS_DOUBLE("Master Digital Playback Switch", 1,
  825 +WSS_DOUBLE("Synth Playback Switch", 1,
832 826 CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1),
833   -WSS_DOUBLE("Master Digital Capture Switch", 1,
  827 +WSS_DOUBLE("Synth Capture Switch", 1,
834 828 CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 6, 6, 1, 1),
835   -WSS_DOUBLE("Master Digital Volume", 1,
  829 +WSS_DOUBLE("Synth Volume", 1,
836 830 CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1),
837 831  
838 832 CS4236_DOUBLE("Capture Volume", 0,
839 833 CS4236_LEFT_MIX_CTRL, CS4236_RIGHT_MIX_CTRL, 5, 5, 3, 1),
840 834  
841   -WSS_DOUBLE("PCM Switch", 0,
  835 +WSS_DOUBLE("PCM Playback Switch", 0,
842 836 CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
  837 +WSS_DOUBLE("PCM Capture Switch", 0,
  838 + CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1),
843 839 WSS_DOUBLE("PCM Volume", 0,
844 840 CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1),
845 841  
846 842  
847 843  
848 844  
849 845  
850 846  
851 847  
852 848  
853 849  
... ... @@ -855,28 +851,25 @@
855 851 CS4236_DOUBLE("Mic Playback Switch", 0,
856 852 CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 6, 6, 1, 1),
857 853 CS4236_SINGLE("Mic Volume", 0, CS4236_LEFT_MIC, 0, 31, 1),
858   -CS4236_SINGLE("Mic Playback Boost", 0, CS4236_LEFT_MIC, 5, 1, 0),
  854 +CS4236_SINGLE("Mic Boost (+20dB)", 0, CS4236_LEFT_MIC, 5, 1, 0),
859 855  
860   -WSS_DOUBLE("Aux Playback Switch", 0,
  856 +WSS_DOUBLE("Line Playback Switch", 0,
861 857 CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1),
862   -WSS_DOUBLE("Aux Capture Switch", 0,
  858 +WSS_DOUBLE("Line Capture Switch", 0,
863 859 CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 6, 6, 1, 1),
864   -WSS_DOUBLE("Aux Volume", 0,
  860 +WSS_DOUBLE("Line Volume", 0,
865 861 CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1),
866 862  
867   -WSS_DOUBLE("Aux Playback Switch", 1,
  863 +WSS_DOUBLE("CD Playback Switch", 1,
868 864 CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
869   -WSS_DOUBLE("Aux Capture Switch", 1,
  865 +WSS_DOUBLE("CD Capture Switch", 1,
870 866 CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 6, 6, 1, 1),
871   -WSS_DOUBLE("Aux Volume", 1,
  867 +WSS_DOUBLE("CD Volume", 1,
872 868 CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1),
873 869  
874   -CS4236_DOUBLE1("Master Mono Switch", 0,
875   - CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1),
876   -
877   -CS4236_DOUBLE1("Mono Switch", 0,
  870 +CS4236_DOUBLE1("Beep Playback Switch", 0,
878 871 CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1),
879   -WSS_SINGLE("Mono Volume", 0, CS4231_MONO_CTRL, 0, 15, 1),
  872 +WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1),
880 873  
881 874 WSS_DOUBLE("Analog Loopback Switch", 0,
882 875 CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 7, 7, 1, 0),
sound/isa/wss/wss_lib.c
Diff comments   View file @ b753e03
... ... @@ -2224,7 +2224,7 @@
2224 2224 .get = snd_wss_get_mux,
2225 2225 .put = snd_wss_put_mux,
2226 2226 },
2227   -WSS_DOUBLE("Mic Boost", 0,
  2227 +WSS_DOUBLE("Mic Boost (+20dB)", 0,
2228 2228 CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0),
2229 2229 WSS_SINGLE("Loopback Capture Switch", 0,
2230 2230 CS4231_LOOPBACK, 0, 1, 0),
2231 2231  
2232 2232  
... ... @@ -2235,14 +2235,14 @@
2235 2235 WSS_DOUBLE_TLV("Line Playback Volume", 0,
2236 2236 CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1,
2237 2237 db_scale_5bit_12db_max),
2238   -WSS_SINGLE("Mono Playback Switch", 0,
  2238 +WSS_SINGLE("Beep Playback Switch", 0,
2239 2239 CS4231_MONO_CTRL, 7, 1, 1),
2240   -WSS_SINGLE_TLV("Mono Playback Volume", 0,
  2240 +WSS_SINGLE_TLV("Beep Playback Volume", 0,
2241 2241 CS4231_MONO_CTRL, 0, 15, 1,
2242 2242 db_scale_4bit),
2243 2243 WSS_SINGLE("Mono Output Playback Switch", 0,
2244 2244 CS4231_MONO_CTRL, 6, 1, 1),
2245   -WSS_SINGLE("Mono Output Playback Bypass", 0,
  2245 +WSS_SINGLE("Beep Bypass Playback Switch", 0,
2246 2246 CS4231_MONO_CTRL, 5, 1, 0),
2247 2247 };
2248 2248