From owner-svn-src-all@FreeBSD.ORG  Sat Apr 26 00:40:16 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C541958D;
 Sat, 26 Apr 2014 00:40:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B28291BEE;
 Sat, 26 Apr 2014 00:40:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3Q0eGIb033160;
 Sat, 26 Apr 2014 00:40:16 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3Q0eGWC033158;
 Sat, 26 Apr 2014 00:40:16 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201404260040.s3Q0eGWC033158@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 26 Apr 2014 00:40:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264958 - stable/10/sys/dev/sound/pci/hda
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2014 00:40:16 -0000

Author: marius
Date: Sat Apr 26 00:40:16 2014
New Revision: 264958
URL: http://svnweb.freebsd.org/changeset/base/264958

Log:
  MFC: r264831
  
  Add quirk to configure headphones redirection on Intel DH87RL boards.

Modified:
  stable/10/sys/dev/sound/pci/hda/hdaa_patches.c
  stable/10/sys/dev/sound/pci/hda/hdac.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdaa_patches.c	Sat Apr 26 00:40:02 2014	(r264957)
+++ stable/10/sys/dev/sound/pci/hda/hdaa_patches.c	Sat Apr 26 00:40:16 2014	(r264958)
@@ -356,7 +356,7 @@ hdac_pin_patch(struct hdaa_widget *w)
 		case 25:
 			patch = "as=1 seq=15";
 			break;
-		/* 
+		/*
 		 * Group onboard mic and headphone mic
 		 * together.  Fixes onboard mic.
 		 */
@@ -384,6 +384,13 @@ hdac_pin_patch(struct hdaa_widget *w)
 			patch = "as=1 seq=15";
 			break;
 		}
+	} else if (id == HDA_CODEC_ALC892 &&
+	    subid == INTEL_DH87RL_SUBVENDOR) {
+		switch (nid) {
+		case 27:
+			patch = "as=1 seq=15";
+			break;
+		}
 	}
 
 	if (patch != NULL)

Modified: stable/10/sys/dev/sound/pci/hda/hdac.h
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdac.h	Sat Apr 26 00:40:02 2014	(r264957)
+++ stable/10/sys/dev/sound/pci/hda/hdac.h	Sat Apr 26 00:40:16 2014	(r264958)
@@ -155,6 +155,7 @@
 /* OEM/subvendors */
 
 /* Intel */
+#define	INTEL_DH87RL_SUBVENDOR	HDA_MODEL_CONSTRUCT(INTEL, 0x204a)
 #define INTEL_D101GGC_SUBVENDOR	HDA_MODEL_CONSTRUCT(INTEL, 0xd600)
 
 /* HP/Compaq */