diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2015-01-16 16:15:13 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-16 16:44:08 -0500 |
commit | 0902fbb9ccf7e3be67b9774b0d5f096da44e7c65 (patch) | |
tree | 43055b387a000296775d50d270091b3b06be63fd /sound/pci/oxygen/oxygen_mixer.c | |
parent | 20eb26a2ec8d28f6106d210ea6a12f360e57a72b (diff) |
ALSA: oxygen: add support for third analog input
Make it possible for cards to have three stereo analog input pairs.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
-rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 2f698a9a5044..6492bca8c70f 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
@@ -941,6 +941,33 @@ static const struct { | |||
941 | }, | 941 | }, |
942 | }, | 942 | }, |
943 | { | 943 | { |
944 | .pcm_dev = CAPTURE_3_FROM_I2S_3, | ||
945 | .controls = { | ||
946 | { | ||
947 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
948 | .name = "Analog Input Monitor Playback Switch", | ||
949 | .index = 2, | ||
950 | .info = snd_ctl_boolean_mono_info, | ||
951 | .get = monitor_get, | ||
952 | .put = monitor_put, | ||
953 | .private_value = OXYGEN_ADC_MONITOR_C, | ||
954 | }, | ||
955 | { | ||
956 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
957 | .name = "Analog Input Monitor Playback Volume", | ||
958 | .index = 2, | ||
959 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | ||
960 | SNDRV_CTL_ELEM_ACCESS_TLV_READ, | ||
961 | .info = monitor_volume_info, | ||
962 | .get = monitor_get, | ||
963 | .put = monitor_put, | ||
964 | .private_value = OXYGEN_ADC_MONITOR_C_HALF_VOL | ||
965 | | (1 << 8), | ||
966 | .tlv = { .p = monitor_db_scale, }, | ||
967 | }, | ||
968 | }, | ||
969 | }, | ||
970 | { | ||
944 | .pcm_dev = CAPTURE_1_FROM_SPDIF, | 971 | .pcm_dev = CAPTURE_1_FROM_SPDIF, |
945 | .controls = { | 972 | .controls = { |
946 | { | 973 | { |