update

4 files changed, 91 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f01e3856ac23..24ed5f16ab0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-g14
 	pkgdesc = Linux
-	pkgver = 5.8.7.arch1
+	pkgver = 5.8.12.arch1
 	pkgrel = 1
 	url = https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/
 	arch = x86_64
@@ -12,14 +12,14 @@ pkgbase = linux-g14
 	makedepends = xmlto
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.8.7-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.8.12-arch1
 	source = config
 	source = sphinx-workaround.patch
 	source = sys-kernel_arch-sources-g14_files_0001-nonupstream-navi10-vfio-reset.patch
 	source = sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch
 	source = sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch
 	source = sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
-	source = sys-kernel_arch-sources-g14_files_0006-ALSA-hda-fixup-headset-for-ASUS-GX502-laptop.patch
+	source = sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch
 	source = sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch
 	source = sys-kernel_arch-sources-g14_files_6003-vboxdrv-glp.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@@ -31,8 +31,9 @@ pkgbase = linux-g14
 	sha256sums = 02c59a722f5d1912ba9ee4c2b5e84b079c13badc225040b834a18a42345a7a61
 	sha256sums = edf23d81eb39f38e106c6ce172600cc06d7d155a4ef578c3c94344a45a8a7858
 	sha256sums = a7b045dc36aea9b3203a4910da3f3314121672e940d7bd8a8cf0126d913e0fe3
-	sha256sums = 68bf0dcc390ed14d97f48ebd1095d2587ac2eb2671445125fbcaaf7a6aa01733
+	sha256sums = 8ef9f603fa838cda5eec84da18f00b81f5acde9b3705717cbc4b0e7ee2e2fe8d
 	sha256sums = ac09472e9bcd5604666590b798b9194d446f79fa718ea67889173498676e99c3
+	sha256sums = d2b60458875f5be280ee755276b3702c4657baaab82850d53a64faf5814d538a
 	sha256sums = 7063af2e6588575ee4fd20d2339850221595acd3da5d8912e6298aea57186887
 	sha256sums = e92f713d50425be96f118a7a3b9f62787453341a27ff10ac5ba394de060ccef7
 
diff --git a/PKGBUILD b/PKGBUILD
index 41a52ef94577..e5e9ec0dbf26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-g14
-pkgver=5.8.7.arch1
+pkgver=5.8.12.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -23,7 +23,8 @@ source=(
 	"sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch"
 	"sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch"
 	"sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch"
-	"sys-kernel_arch-sources-g14_files_0006-ALSA-hda-fixup-headset-for-ASUS-GX502-laptop.patch"
+	#"sys-kernel_arch-sources-g14_files_0006-ALSA-hda-fixup-headset-for-ASUS-GX502-laptop.patch"
+	"sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch"
 	"sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch"
 	"sys-kernel_arch-sources-g14_files_6003-vboxdrv-glp.patch"
 )
@@ -39,12 +40,15 @@ sha256sums=('SKIP'
             '02c59a722f5d1912ba9ee4c2b5e84b079c13badc225040b834a18a42345a7a61'
             'edf23d81eb39f38e106c6ce172600cc06d7d155a4ef578c3c94344a45a8a7858'
             'a7b045dc36aea9b3203a4910da3f3314121672e940d7bd8a8cf0126d913e0fe3'
-            '68bf0dcc390ed14d97f48ebd1095d2587ac2eb2671445125fbcaaf7a6aa01733'
+            '8ef9f603fa838cda5eec84da18f00b81f5acde9b3705717cbc4b0e7ee2e2fe8d'
             'ac09472e9bcd5604666590b798b9194d446f79fa718ea67889173498676e99c3'
+            'd2b60458875f5be280ee755276b3702c4657baaab82850d53a64faf5814d538a'
             '7063af2e6588575ee4fd20d2339850221595acd3da5d8912e6298aea57186887'
             'e92f713d50425be96f118a7a3b9f62787453341a27ff10ac5ba394de060ccef7')
 
 
+
+
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
diff --git a/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch b/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
index 5b5eb5515ac3..0a589f6c1425 100644
--- a/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
+++ b/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
@@ -1,7 +1,4 @@
-From 5846c5fffd392e1158e228d05e64c0613fef4d49 Mon Sep 17 00:00:00 2001
-From: Luke D Jones <luke@ljones.dev>
-Date: Sun, 6 Sep 2020 19:30:02 +1200
-Subject: [PATCH V6] HID: ASUS: Add support for ASUS N-Key keyboard
+From: Luke D Jones <luke@xxxxxxxxxx>
 
 The ASUS N-Key keyboard uses the productId of 0x1866 and is used in
 almost all modern ASUS gaming laptops with slight changes to the
@@ -23,7 +20,7 @@ intitialised before such things as keyboard backlight control work.
 Misc changes in scope: update some hardcoded comparisons to use an
 available define.
 
-Signed-off-by: Luke D Jones <luke@ljones.dev>
+Signed-off-by: Luke D Jones <luke@xxxxxxxxxx>
 ---
  drivers/hid/hid-asus.c                     | 188 ++++++++++++++++++---
  drivers/hid/hid-ids.h                      |   1 +
@@ -344,4 +341,3 @@ index 897b8332a39f..05253cfe786c 100644
  /* Wireless */
 -- 
 2.26.2
-
diff --git a/sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch b/sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch
new file mode 100644
index 000000000000..f1ff2418b149
--- /dev/null
+++ b/sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch
@@ -0,0 +1,77 @@
+--- a/sound/pci/hda/patch_realtek.c	2020-09-27 19:57:22.699000000 +0200
++++ b/sound/pci/hda/patch_realtek.c	2020-09-27 22:06:26.887560162 +0200
+@@ -6004,6 +6004,28 @@
+ 		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
+ }
+ 
++static void alc289_fixup_ga401(struct hda_codec *codec,
++					const struct hda_fixup *fix, int action)
++{
++	static const hda_nid_t conn[] = { 0x02 };
++	static const struct hda_pintbl pincfgs[] = {
++		{ 0x17, 0x90170130 }, /* bass speaker */
++		{ 0x19, 0x03a11050 }, /* headphone mic with jack detect */
++		{ 0x21, 0x03211430 }, /* headphone playback */
++	};
++	static const struct coef_fw coef0289[] = {
++		WRITE_COEF(0x45, 0x5289),
++		WRITE_COEF(0x46, 0x0004), // not working for a reason.. (plugged redetect not working)
++		{}
++	};
++
++	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
++		snd_hda_apply_pincfgs(codec, pincfgs);
++		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn); // maps correct mixer
++	} else if (action == HDA_FIXUP_ACT_INIT) {
++		alc_process_coef_fw(codec, coef0289);
++	}
++}
+ 
+ static void alc294_gx502_toggle_output(struct hda_codec *codec,
+ 					struct hda_jack_callback *cb)
+@@ -6218,6 +6240,7 @@
+ 	ALC285_FIXUP_THINKPAD_HEADSET_JACK,
+ 	ALC294_FIXUP_ASUS_HPE,
+ 	ALC294_FIXUP_ASUS_COEF_1B,
++	ALC294_FIXUP_ASUS_GA502,
+ 	ALC294_FIXUP_ASUS_GX502_HP,
+ 	ALC294_FIXUP_ASUS_GX502_PINS,
+ 	ALC294_FIXUP_ASUS_GX502_VERBS,
+@@ -6230,7 +6253,6 @@
+ 	ALC269VC_FIXUP_ACER_HEADSET_MIC,
+ 	ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,
+ 	ALC289_FIXUP_ASUS_GA401,
+-	ALC289_FIXUP_ASUS_GA502,
+ 	ALC256_FIXUP_ACER_MIC_NO_PRESENCE,
+ 	ALC285_FIXUP_HP_GPIO_AMP_INIT,
+ 	ALC269_FIXUP_CZC_B20,
+@@ -7483,16 +7505,13 @@
+ 		.chain_id = ALC269_FIXUP_HEADSET_MIC
+ 	},
+ 	[ALC289_FIXUP_ASUS_GA401] = {
+-		.type = HDA_FIXUP_PINS,
+-		.v.pins = (const struct hda_pintbl[]) {
+-			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */
+-			{ }
+-		},
++		.type = HDA_FIXUP_FUNC,
++		.v.func = alc289_fixup_ga401
+ 	},
+-	[ALC289_FIXUP_ASUS_GA502] = {
++	[ALC294_FIXUP_ASUS_GA502] = {
+ 		.type = HDA_FIXUP_PINS,
+ 		.v.pins = (const struct hda_pintbl[]) {
+-			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */
++			{ 0x19, 0x03a11050 }, /* headphone mic with jack detect */
+ 			{ }
+ 		},
+ 	},
+@@ -7795,7 +7814,7 @@
+ 	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
+ 	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
+-	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
++	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC294_FIXUP_ASUS_GA502),
+ 	SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
+ 	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
+ 	SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),