diff options
| author | Yao-Wen Mao <yaowen@google.com> | 2015-07-29 15:13:54 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:24 +0200 |
| commit | 2df4c8a9db171a0676aae3d6f3c965f74ca37255 (patch) | |
| tree | 58bec06af2041681f8f3052c5dc1d643cdc1a4b2 /sound | |
| parent | 403652a78799f25e3c0d07326805cc1ffcce0f87 (diff) | |
| download | kernel_samsung_smdk4412-2df4c8a9db171a0676aae3d6f3c965f74ca37255.zip kernel_samsung_smdk4412-2df4c8a9db171a0676aae3d6f3c965f74ca37255.tar.gz kernel_samsung_smdk4412-2df4c8a9db171a0676aae3d6f3c965f74ca37255.tar.bz2 | |
ALSA: usb-audio: add dB range mapping for some devices
commit 2d1cb7f658fb9c3ba8f9dab8aca297d4dfdec835 upstream.
Add the correct dB ranges of Bose Companion 5 and Drangonfly DAC 1.2.
Signed-off-by: Yao-Wen Mao <yaowen@google.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/mixer_maps.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 851786f..893b750 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -312,6 +312,20 @@ static const struct usbmix_name_map scms_usb3318_map[] = { { 0 } }; +/* Bose companion 5, the dB conversion factor is 16 instead of 256 */ +static struct usbmix_dB_map bose_companion5_dB = {-5006, -6}; +static struct usbmix_name_map bose_companion5_map[] = { + { 3, NULL, .dB = &bose_companion5_dB }, + { 0 } /* terminator */ +}; + +/* Dragonfly DAC 1.2, the dB conversion factor is 1 instead of 256 */ +static struct usbmix_dB_map dragonfly_1_2_dB = {0, 5000}; +static struct usbmix_name_map dragonfly_1_2_map[] = { + { 7, NULL, .dB = &dragonfly_1_2_dB }, + { 0 } /* terminator */ +}; + /* * Control map entries */ @@ -394,6 +408,16 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x25c4, 0x0003), .map = scms_usb3318_map, }, + { + /* Bose Companion 5 */ + .id = USB_ID(0x05a7, 0x1020), + .map = bose_companion5_map, + }, + { + /* Dragonfly DAC 1.2 */ + .id = USB_ID(0x21b4, 0x0081), + .map = dragonfly_1_2_map, + }, { 0 } /* terminator */ }; |