From owner-svn-src-head@FreeBSD.ORG Sun Jul 27 08:37:42 2014 Return-Path: Delivered-To: svn-src-head@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 AC7332BA; Sun, 27 Jul 2014 08:37:42 +0000 (UTC) Received: from mail-we0-x22b.google.com (mail-we0-x22b.google.com [IPv6:2a00:1450:400c:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3DBF23B7; Sun, 27 Jul 2014 08:37:41 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id p10so6130351wes.2 for ; Sun, 27 Jul 2014 01:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=UmzkghAlh1p1h7HuQtwp7Med7h/4cq8frUz5bg3n264=; b=Fo7qP+N1I0bWMRMTpvKznLe4Q574swnIxsQQBPy9YKeC8AdxW1LFmAD4PSiWVLORKq BD8e825yuEVYHa455GBgnIiwhAEQuiEdBS2UfWRQwjIga66Qm+5TtsylvVfqs8TNw9pt 6poDgOu1D9XKuf+qrXfTFNYazaAXSeS21tgpBRaqytl0Wx4oq1KNrg7pShMglnw7p+2D 5cl/n0ISGRUk544HtOhU6WvAQyCIfD+7zAr7qWe5RBdgihvq5RsNh0/WLa+WBlIOqhbT /r1cShRDMkQN/8LW9ubINTiEvljJn0lCcwuptAAKkCwkd1ejAy1moOGvBKI8pBLDJNMa lZRg== X-Received: by 10.180.78.100 with SMTP id a4mr19106580wix.36.1406450259959; Sun, 27 Jul 2014 01:37:39 -0700 (PDT) Received: from mavbook.mavhome.dp.ua ([134.249.139.101]) by mx.google.com with ESMTPSA id go4sm39811575wjc.39.2014.07.27.01.37.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 27 Jul 2014 01:37:38 -0700 (PDT) Sender: Alexander Motin Message-ID: <53D4BA51.7070505@FreeBSD.org> Date: Sun, 27 Jul 2014 11:37:37 +0300 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Adrian Chadd Subject: Re: svn commit: r268584 - head/sys/dev/sound/pci/hda References: <201407131031.s6DAVTja093433@svn.freebsd.org> <53C335EF.2090606@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Mark Johnston , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2014 08:37:42 -0000 On 27.07.2014 11:27, Adrian Chadd wrote: > actually, scratch that, I had some test hacks in there. Try: > > hdaa0: Patched pins configuration: > hdaa0: nid 0x as seq device conn jack loc color misc > hdaa0: 22 022140f0 15 0 Headphones Jack 1/8 Front Green 0 > hdaa0: 23 61a190f0 15 0 Mic None 1/8 Ext-Rear Pink 0 DISA > hdaa0: 24 02a190f0 15 0 Mic Jack 1/8 Front Pink 0 > hdaa0: 25 40f000f0 15 0 Other None Unknown 0x00 Unknown 0 DISA > hdaa0: 26 901701f0 15 0 Speaker Fixed Analog Internal Unknown 1 > hdaa0: 27 40f001f0 15 0 Other None Unknown 0x00 Unknown 1 DISA > hdaa0: 28 40f001f0 15 0 Other None Unknown 0x00 Unknown 1 DISA > hdaa0: 29 90a601f0 15 0 Mic Fixed Digital Internal Unknown 1 > hdaa0: 4 associations found: > hdaa0: Association 0 (15) out: > hdaa0: Pin nid=22 seq=0 > hdaa0: Association 1 (15) in: > hdaa0: Pin nid=24 seq=0 > hdaa0: Association 2 (15) out: > hdaa0: Pin nid=26 seq=0 > hdaa0: Association 3 (15) in: > hdaa0: Pin nid=29 seq=0 Yes, that is what I'd like to see. Your situation looks a bit more complicated, requiring some bigger patch: Index: hdaa_patches.c =================================================================== --- hdaa_patches.c (revision 269151) +++ hdaa_patches.c (working copy) @@ -346,6 +346,22 @@ hdac_pin_patch(struct hdaa_widget *w) patch = "as=1 seq=15"; break; } + } else if (id == HDA_CODEC_CX20561 && + subid == LENOVO_ZZZ_SUBVENDOR) { + switch (nid) { + case 22: + patch = "as=1 seq=15"; + break; + case 24: + patch = "as=2 seq=14"; + break; + case 26: + patch = "as=1 seq=0"; + break; + case 29: + patch = "as=2 seq=0"; + break; + } } else if (id == HDA_CODEC_CX20590 && (subid == LENOVO_X1_SUBVENDOR || subid == LENOVO_X220_SUBVENDOR || Index: hdac.h =================================================================== --- hdac.h (revision 269151) +++ hdac.h (working copy) @@ -236,6 +236,7 @@ #define LENOVO_X1CRBN_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21f9) #define LENOVO_X220_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21da) #define LENOVO_X300_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x20ac) +#define LENOVO_ZZZ_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x20f2) #define LENOVO_T420_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21ce) #define LENOVO_T430_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21f3) #define LENOVO_T430S_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x21fb) -- Alexander Motin