add GA401II

4 files changed, 27 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7422c3f5f028..f74fcf37bc44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-g14
 	pkgdesc = Linux witch patches for ASUS ROG Zephyrus G14/G15
-	pkgver = 5.7.5.arch1
+	pkgver = 5.7.6.arch1
 	pkgrel = 2
 	url = https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/
 	arch = x86_64
@@ -12,10 +12,9 @@ pkgbase = linux-g14
 	makedepends = xmlto
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.7.5-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.7.6-arch1
 	source = config
 	source = sphinx-workaround.patch
-	source = amdgpu-backlight.patch
 	source = asus-wmi.patch
 	source = i8042v2.patch
 	source = amdgpu-drm-next.patch
@@ -25,9 +24,8 @@ pkgbase = linux-g14
 	sha256sums = SKIP
 	sha256sums = 623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e
 	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
-	sha256sums = 8f9bb0be13e47b8fff55702bb4ea6f4d88eed5b5350d6e7025519f4dcb3cff79
-	sha256sums = 8f54e8693cb661715173fda27b9f4a8baab0ce77175dd5146131a337f4213ea6
-	sha256sums = 554246e9b44e2ecf153959ef5b505d2085d2b5aa2852a4c4de5b595c8e8a9d96
+	sha256sums = 75d09f8c4fded209201e928efe718db28c84732fce0c30b56bcf6e4f4e407101
+	sha256sums = d7a9b7f05a85f4e78eada4fdb0de93902d860aaabc545485e18c30263d0866a1
 	sha256sums = 419913c6b686c6b98fbac82ac9c2ea3c30d130f94de3bb28d6a58bd1c5234814
 
 pkgname = linux-g14
diff --git a/PKGBUILD b/PKGBUILD
index 4610f6d48c85..d065ba6e5e11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-g14
-pkgver=5.7.5.arch1
+pkgver=5.7.6.arch1
 pkgrel=2
 pkgdesc='Linux witch patches for ASUS ROG Zephyrus G14/G15'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -19,7 +19,6 @@ source=(
   "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag"
   config         # the main kernel config file
   sphinx-workaround.patch
-  amdgpu-backlight.patch
   asus-wmi.patch
   i8042v2.patch
   amdgpu-drm-next.patch
@@ -33,9 +32,8 @@ validpgpkeys=(
 sha256sums=('SKIP'
             '623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e'
             '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
-            '8f9bb0be13e47b8fff55702bb4ea6f4d88eed5b5350d6e7025519f4dcb3cff79'
-            '8f54e8693cb661715173fda27b9f4a8baab0ce77175dd5146131a337f4213ea6'
-            '554246e9b44e2ecf153959ef5b505d2085d2b5aa2852a4c4de5b595c8e8a9d96'
+            '75d09f8c4fded209201e928efe718db28c84732fce0c30b56bcf6e4f4e407101'
+            'd7a9b7f05a85f4e78eada4fdb0de93902d860aaabc545485e18c30263d0866a1'
             '419913c6b686c6b98fbac82ac9c2ea3c30d130f94de3bb28d6a58bd1c5234814')
 
 
diff --git a/asus-wmi.patch b/asus-wmi.patch
index 4e9a678de0ff..1618c076a348 100644
--- a/asus-wmi.patch
+++ b/asus-wmi.patch
@@ -1,5 +1,5 @@
 diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
-index c4404d9c1de4..e53c258acf68 100644
+index c4404d9c1de4..f83bcf869255 100644
 --- a/drivers/platform/x86/asus-nb-wmi.c
 +++ b/drivers/platform/x86/asus-nb-wmi.c
 @@ -110,6 +110,18 @@ static struct quirk_entry quirk_asus_forceals = {
@@ -21,7 +21,7 @@ index c4404d9c1de4..e53c258acf68 100644
  static int dmi_matched(const struct dmi_system_id *dmi)
  {
  	pr_info("Identified laptop model '%s'\n", dmi->ident);
-@@ -411,6 +423,42 @@ static const struct dmi_system_id asus_quirks[] = {
+@@ -411,6 +423,51 @@ static const struct dmi_system_id asus_quirks[] = {
  		},
  		.driver_data = &quirk_asus_forceals,
  	},
@@ -43,6 +43,15 @@ index c4404d9c1de4..e53c258acf68 100644
 +		},
 +		.driver_data = &quirk_asus_ga401i,
 +	},
++		{
++		.callback = dmi_matched,
++		.ident = "ASUSTeK COMPUTER INC. GA401II",
++		.matches = {
++				DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++				DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
++		},
++		.driver_data = &quirk_asus_ga401i,
++	},
 +	{
 +		.callback = dmi_matched,
 +		.ident = "ASUSTeK COMPUTER INC. GA502IU",
diff --git a/i8042v2.patch b/i8042v2.patch
index 9cef0ce4be8f..448b78820d74 100644
--- a/i8042v2.patch
+++ b/i8042v2.patch
@@ -1,8 +1,8 @@
 diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
-index 7e048b557462..ee19299ed081 100644
+index 7e048b557462..5cbc3db95834 100644
 --- a/drivers/input/serio/i8042-x86ia64io.h
 +++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -698,6 +698,34 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
+@@ -698,6 +698,41 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
  			DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
  		},
  	},
@@ -21,6 +21,13 @@ index 7e048b557462..ee19299ed081 100644
 +		},
 +	},
 +	{
++		/* ASUS ROG Zephyreus G14 GA401II */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++            DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
++		},
++	},
++	{
 +		/* ASUS ROG Zephyreus G15 GA502IU */
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),