Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 293328
b: refs/heads/master
c: a15a9af
h: refs/heads/master
v: v3
  • Loading branch information
Andrey Danin authored and Mark Brown committed Feb 11, 2012
1 parent 27d8e60 commit 8c06d73
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0a2c056e55029f83dc48b08ec54e6713df5eadf7
refs/heads/master: a15a9af28817034bd059c63033e72fd80e6ee6f5
56 changes: 28 additions & 28 deletions trunk/sound/soc/codecs/alc5632.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,24 +246,24 @@ SOC_DAPM_SINGLE("VOICE2SPK Playback Switch", ALC5632_VOICE_DAC_VOL, 14, 1, 1),

/* Left Record Mixer */
static const struct snd_kcontrol_new alc5632_captureL_mixer_controls[] = {
SOC_DAPM_SINGLE("Mic1 Capture Switch", ALC5632_ADC_REC_MIXER, 14, 1, 1),
SOC_DAPM_SINGLE("Mic2 Capture Switch", ALC5632_ADC_REC_MIXER, 13, 1, 1),
SOC_DAPM_SINGLE("LineInL Capture Switch", ALC5632_ADC_REC_MIXER, 12, 1, 1),
SOC_DAPM_SINGLE("Left Phone Capture Switch", ALC5632_ADC_REC_MIXER, 11, 1, 1),
SOC_DAPM_SINGLE("HPMixerL Capture Switch", ALC5632_ADC_REC_MIXER, 10, 1, 1),
SOC_DAPM_SINGLE("SPKMixer Capture Switch", ALC5632_ADC_REC_MIXER, 9, 1, 1),
SOC_DAPM_SINGLE("MonoMixer Capture Switch", ALC5632_ADC_REC_MIXER, 8, 1, 1),
SOC_DAPM_SINGLE("MIC12REC_L Capture Switch", ALC5632_ADC_REC_MIXER, 14, 1, 1),
SOC_DAPM_SINGLE("MIC22REC_L Capture Switch", ALC5632_ADC_REC_MIXER, 13, 1, 1),
SOC_DAPM_SINGLE("LIL2REC Capture Switch", ALC5632_ADC_REC_MIXER, 12, 1, 1),
SOC_DAPM_SINGLE("PH2REC_L Capture Switch", ALC5632_ADC_REC_MIXER, 11, 1, 1),
SOC_DAPM_SINGLE("HPL2REC Capture Switch", ALC5632_ADC_REC_MIXER, 10, 1, 1),
SOC_DAPM_SINGLE("SPK2REC_L Capture Switch", ALC5632_ADC_REC_MIXER, 9, 1, 1),
SOC_DAPM_SINGLE("MONO2REC_L Capture Switch", ALC5632_ADC_REC_MIXER, 8, 1, 1),
};

/* Right Record Mixer */
static const struct snd_kcontrol_new alc5632_captureR_mixer_controls[] = {
SOC_DAPM_SINGLE("Mic1 Capture Switch", ALC5632_ADC_REC_MIXER, 6, 1, 1),
SOC_DAPM_SINGLE("Mic2 Capture Switch", ALC5632_ADC_REC_MIXER, 5, 1, 1),
SOC_DAPM_SINGLE("LineInR Capture Switch", ALC5632_ADC_REC_MIXER, 4, 1, 1),
SOC_DAPM_SINGLE("Right Phone Capture Switch", ALC5632_ADC_REC_MIXER, 3, 1, 1),
SOC_DAPM_SINGLE("HPMixerR Capture Switch", ALC5632_ADC_REC_MIXER, 2, 1, 1),
SOC_DAPM_SINGLE("SPKMixer Capture Switch", ALC5632_ADC_REC_MIXER, 1, 1, 1),
SOC_DAPM_SINGLE("MonoMixer Capture Switch", ALC5632_ADC_REC_MIXER, 0, 1, 1),
SOC_DAPM_SINGLE("MIC12REC_R Capture Switch", ALC5632_ADC_REC_MIXER, 6, 1, 1),
SOC_DAPM_SINGLE("MIC22REC_R Capture Switch", ALC5632_ADC_REC_MIXER, 5, 1, 1),
SOC_DAPM_SINGLE("LIR2REC Capture Switch", ALC5632_ADC_REC_MIXER, 4, 1, 1),
SOC_DAPM_SINGLE("PH2REC_R Capture Switch", ALC5632_ADC_REC_MIXER, 3, 1, 1),
SOC_DAPM_SINGLE("HPR2REC Capture Switch", ALC5632_ADC_REC_MIXER, 2, 1, 1),
SOC_DAPM_SINGLE("SPK2REC_R Capture Switch", ALC5632_ADC_REC_MIXER, 1, 1, 1),
SOC_DAPM_SINGLE("MONO2REC_R Capture Switch", ALC5632_ADC_REC_MIXER, 0, 1, 1),
};

static const char *alc5632_spk_n_sour_sel[] = {
Expand Down Expand Up @@ -449,22 +449,22 @@ static const struct snd_soc_dapm_route alc5632_dapm_routes[] = {
{"Mono Mix", "DAC2MONO Playback Switch", "DAC Left Channel"},

/* Left record mixer */
{"Left Capture Mix", "LineInL Capture Switch", "LINEINL"},
{"Left Capture Mix", "Left Phone Capture Switch", "PHONEN"},
{"Left Capture Mix", "Mic1 Capture Switch", "MIC1 Pre Amp"},
{"Left Capture Mix", "Mic2 Capture Switch", "MIC2 Pre Amp"},
{"Left Capture Mix", "HPMixerL Capture Switch", "HPL Mix"},
{"Left Capture Mix", "SPKMixer Capture Switch", "Speaker Mix"},
{"Left Capture Mix", "MonoMixer Capture Switch", "Mono Mix"},
{"Left Capture Mix", "LIL2REC Capture Switch", "LINEINL"},
{"Left Capture Mix", "PH2REC_L Capture Switch", "PHONEN"},
{"Left Capture Mix", "MIC12REC_L Capture Switch", "MIC1 Pre Amp"},
{"Left Capture Mix", "MIC22REC_L Capture Switch", "MIC2 Pre Amp"},
{"Left Capture Mix", "HPL2REC Capture Switch", "HPL Mix"},
{"Left Capture Mix", "SPK2REC_L Capture Switch", "Speaker Mix"},
{"Left Capture Mix", "MONO2REC_L Capture Switch", "Mono Mix"},

/*Right record mixer */
{"Right Capture Mix", "LineInR Capture Switch", "LINEINR"},
{"Right Capture Mix", "Right Phone Capture Switch", "PHONEP"},
{"Right Capture Mix", "Mic1 Capture Switch", "MIC1 Pre Amp"},
{"Right Capture Mix", "Mic2 Capture Switch", "MIC2 Pre Amp"},
{"Right Capture Mix", "HPMixerR Capture Switch", "HPR Mix"},
{"Right Capture Mix", "SPKMixer Capture Switch", "Speaker Mix"},
{"Right Capture Mix", "MonoMixer Capture Switch", "Mono Mix"},
{"Right Capture Mix", "LIR2REC Capture Switch", "LINEINR"},
{"Right Capture Mix", "PH2REC_R Capture Switch", "PHONEP"},
{"Right Capture Mix", "MIC12REC_R Capture Switch", "MIC1 Pre Amp"},
{"Right Capture Mix", "MIC22REC_R Capture Switch", "MIC2 Pre Amp"},
{"Right Capture Mix", "HPR2REC Capture Switch", "HPR Mix"},
{"Right Capture Mix", "SPK2REC_R Capture Switch", "Speaker Mix"},
{"Right Capture Mix", "MONO2REC_R Capture Switch", "Mono Mix"},

/* headphone left mux */
{"Left Headphone Mux", "HP Left Mix", "HPL Mix"},
Expand Down

0 comments on commit 8c06d73

Please sign in to comment.