Date: Sun, 27 Jul 2014 11:37:37 +0300 From: Alexander Motin <mav@FreeBSD.org> To: Adrian Chadd <adrian@freebsd.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, Mark Johnston <markj@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r268584 - head/sys/dev/sound/pci/hda Message-ID: <53D4BA51.7070505@FreeBSD.org> In-Reply-To: <CAJ-Vmo=UTQeETt3sqPSApFfoes-oRS7Akq_WOOd3Mdbi_Kr3Ug@mail.gmail.com> References: <201407131031.s6DAVTja093433@svn.freebsd.org> <CAJ-Vmo=hsK6k6VPcig69srL%2BV_AO5yQo4z%2B2XycvGB6_fRwSGg@mail.gmail.com> <53C335EF.2090606@FreeBSD.org> <CAJ-VmomUm7JdNk-aX2UOKQMO9LhRh6LhPTNBQu8MCJ%2BPtnWLKw@mail.gmail.com> <CAJ-Vmo=SXQYHFFB3wg=CaC1w_ZJG7M1Hq5mW-nL1GRPYrq9tqQ@mail.gmail.com> <CAJ-Vmo=UTQeETt3sqPSApFfoes-oRS7Akq_WOOd3Mdbi_Kr3Ug@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53D4BA51.7070505>