diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
commit | d033de5ceee8333e4fee3d59a956244d3736102a (patch) | |
tree | 5bdebcac18ed67890571632570c324e0c41a7223 /sound/usb/mixer_maps.c | |
parent | 1a8e7fab70c8d7cad2e606e7b21d46e42e51c2fd (diff) | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) | |
download | talos-op-linux-d033de5ceee8333e4fee3d59a956244d3736102a.tar.gz talos-op-linux-d033de5ceee8333e4fee3d59a956244d3736102a.zip |
Merge tag 'v4.2-rc6' into asoc-topology
Linux 4.2-rc6
Diffstat (limited to 'sound/usb/mixer_maps.c')
-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 e5000da9e9d7..6a803eff87f7 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -341,6 +341,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 */ @@ -451,6 +465,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 */ }; |