stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Yao-Wen Mao <yaowen@google.com>,
	Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 3.10 07/26] ALSA: usb-audio: add dB range mapping for some devices
Date: Sat,  8 Aug 2015 15:07:23 -0700	[thread overview]
Message-ID: <20150808220718.522600928@linuxfoundation.org> (raw)
In-Reply-To: <20150808220718.230934936@linuxfoundation.org>

3.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Yao-Wen Mao <yaowen@google.com>

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/usb/mixer_maps.c |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -330,6 +330,20 @@ static const struct usbmix_name_map scms
 	{ 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
  */
@@ -432,6 +446,16 @@ static struct usbmix_ctl_map usbmix_ctl_
 		.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 */
 };
 



  parent reply	other threads:[~2015-08-08 22:07 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-08 22:07 [PATCH 3.10 00/26] 3.10.86-stable review Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 01/26] mm: avoid setting up anonymous pages into file mapping Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 02/26] freeing unlinked file indefinitely delayed Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 03/26] s390/sclp: clear upper register halves in _sclp_print_early Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 04/26] ARC: make sure instruction_pointer() returns unsigned value Greg Kroah-Hartman
2015-08-08 22:07 ` Greg Kroah-Hartman [this message]
2015-08-08 22:07 ` [PATCH 3.10 08/26] ALSA: hda - Fix MacBook Pro 5,2 quirk Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 10/26] mac80211: clear subdir_stations when removing debugfs Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 11/26] mmc: sdhci-esdhc: Make 8BIT bus work Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 12/26] mmc: sdhci-pxav3: fix platform_data is not initialized Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 13/26] md/raid1: fix test for was read error from last working device Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 14/26] tile: use free_bootmem_late() for initrd Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 15/26] Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 16/26] blkcg: fix gendisk reference leak in blkg_conf_prep() Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 17/26] ata: pmp: add quirk for Marvell 4140 SATA PMP Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 18/26] usb-storage: ignore ZTE MF 823 card reader in mode 0x1225 Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 19/26] xhci: Calculate old endpoints correctly on device reset Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 20/26] xhci: report U3 when link is in resume state Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 21/26] xhci: prevent bus_suspend if SS port resuming in phase 1 Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 22/26] rds: rds_ib_device.refcount overflow Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 24/26] iscsi-target: Fix use-after-free during TPG session shutdown Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 25/26] iscsi-target: Fix iser explicit logout TX kthread leak Greg Kroah-Hartman
2015-08-08 22:07 ` [PATCH 3.10 26/26] efi: fix 32bit kernel boot failed problem using efi Greg Kroah-Hartman
2015-08-09  3:14 ` [PATCH 3.10 00/26] 3.10.86-stable review Guenter Roeck
2015-08-10 19:10   ` Greg Kroah-Hartman
2015-08-10  4:38 ` Sudip Mukherjee
2015-08-10 18:12 ` Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150808220718.522600928@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tiwai@suse.de \
    --cc=yaowen@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).