Merge G15 into main patch

4 files changed, 46 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83c25555ec7a..c5c0474066e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,6 @@ pkgbase = linux-g14
 	source = k10-temp.patch
 	source = asus-wmi.patch
 	source = i8042.patch
-	source = asus-wmi-g15.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
@@ -27,9 +26,8 @@ pkgbase = linux-g14
 	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
 	sha256sums = 8f9bb0be13e47b8fff55702bb4ea6f4d88eed5b5350d6e7025519f4dcb3cff79
 	sha256sums = 28d35438857ffe9fccab8d05e22cd9c590f3b52172809e78d726f035f4b5557f
-	sha256sums = 4bc71b8651dcb8bb8370b39a6d8ac582eeabfb91564c74335f305aaef7dae2ad
+	sha256sums = e62dec5a7a239716190c1bdb1b11e7c2d6494cdb642b62b9d0c679fa0f18e0f8
 	sha256sums = 03afc868493b7a7a066aaf2113662fd29ffde7a5665dee8539fe3982048788e4
-	sha256sums = 78c3eb55b5ddd2e5bf10f264c2351cbc97dfbc377668ac04d2a288aaea188dfa
 
 pkgname = linux-g14
 	pkgdesc = The Linux witch patches for ASUS ROG Zephyrus G14 kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index b7ddac1e8de7..91746f9c4112 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ source=(
   k10-temp.patch
   asus-wmi.patch
   i8042.patch
-  asus-wmi-g15.patch
+  #asus-wmi-g15.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -36,9 +36,9 @@ sha256sums=('SKIP'
             '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
             '8f9bb0be13e47b8fff55702bb4ea6f4d88eed5b5350d6e7025519f4dcb3cff79'
             '28d35438857ffe9fccab8d05e22cd9c590f3b52172809e78d726f035f4b5557f'
-            '4bc71b8651dcb8bb8370b39a6d8ac582eeabfb91564c74335f305aaef7dae2ad'
-            '03afc868493b7a7a066aaf2113662fd29ffde7a5665dee8539fe3982048788e4'
-            '78c3eb55b5ddd2e5bf10f264c2351cbc97dfbc377668ac04d2a288aaea188dfa')
+            'e62dec5a7a239716190c1bdb1b11e7c2d6494cdb642b62b9d0c679fa0f18e0f8'
+            '03afc868493b7a7a066aaf2113662fd29ffde7a5665dee8539fe3982048788e4')
+
 
 
 
diff --git a/asus-wmi-g15.patch b/asus-wmi-g15.patch
deleted file mode 100644
index a28cc518447f..000000000000
--- a/asus-wmi-g15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
-index 7d13193f18fb..f2adc162aa74 100644
---- a/drivers/platform/x86/asus-nb-wmi.c
-+++ b/drivers/platform/x86/asus-nb-wmi.c
-@@ -95,6 +95,12 @@ static struct quirk_entry quirk_asus_ga401i = {
-        .wmi_backlight_set_devstate = true,
- };
- 
-+static struct quirk_entry quirk_asus_ga502i = {
-+       .wapf = 4, // not sure if that is correct
-+       .wmi_backlight_power = true,
-+       .wmi_backlight_set_devstate = true,
-+};
-+
- static int dmi_matched(const struct dmi_system_id *dmi)
- {
- 	pr_info("Identified laptop model '%s'\n", dmi->ident);
-@@ -414,6 +420,15 @@ static const struct dmi_system_id asus_quirks[] = {
-                },
-                .driver_data = &quirk_asus_ga401i,
-        },
-+       {
-+               .callback = dmi_matched,
-+               .ident = "ASUSTeK COMPUTER INC. GA502IU",
-+               .matches = {
-+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+                       DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
-+               },
-+               .driver_data = &quirk_asus_ga502i,
-+      },
-        {},
- };
- 
diff --git a/asus-wmi.patch b/asus-wmi.patch
index 8d8b62f90d6e..ce2c1aab08fb 100644
--- a/asus-wmi.patch
+++ b/asus-wmi.patch
@@ -1,26 +1,8 @@
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -116,6 +116,8 @@
- 	u32 arg0;
- 	u32 arg1;
- 	u32 arg2; /* At least TUF Gaming series uses 3 dword input buffer. */
-+        u32 arg3; /* At least ROG Zephyrus G14 series uses 5 dword input buffer */
-+        u32 arg4;
- } __packed;
- 
- /*
-@@ -1722,7 +1724,7 @@
- 	asus->fan_boost_mode = new_mode;
- 	fan_boost_mode_write(asus);
- 
--	return result;
-+	return count;
- }
- 
- // Fan boost mode: 0 - normal, 1 - overboost, 2 - silent
+diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
+index c4404d9c1de4..e449f4b050c2 100644
 --- a/drivers/platform/x86/asus-nb-wmi.c
 +++ b/drivers/platform/x86/asus-nb-wmi.c
-@@ -110,6 +110,12 @@
+@@ -110,6 +110,18 @@ static struct quirk_entry quirk_asus_forceals = {
  	.wmi_force_als_set = true,
  };
  
@@ -30,10 +12,16 @@
 +       .wmi_backlight_set_devstate = true,
 +};
 +
++static struct quirk_entry quirk_asus_ga502i = {
++       .wapf = 4, // not sure if that is correct
++       .wmi_backlight_power = true,
++       .wmi_backlight_set_devstate = true,
++};
++
  static int dmi_matched(const struct dmi_system_id *dmi)
  {
  	pr_info("Identified laptop model '%s'\n", dmi->ident);
-@@ -411,7 +417,25 @@
+@@ -411,7 +423,34 @@ static const struct dmi_system_id asus_quirks[] = {
  		},
  		.driver_data = &quirk_asus_forceals,
  	},
@@ -56,7 +44,38 @@
 +               },
 +               .driver_data = &quirk_asus_ga401i,
 +       },
++       {
++               .callback = dmi_matched,
++               .ident = "ASUSTeK COMPUTER INC. GA502IU",
++               .matches = {
++                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++                       DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
++               },
++               .driver_data = &quirk_asus_ga502i,
++      },
 +       {},
  };
  
  static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)
+diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
+index 01becbe2a9a8..acbc3626852b 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -116,6 +116,8 @@ struct bios_args {
+ 	u32 arg0;
+ 	u32 arg1;
+ 	u32 arg2; /* At least TUF Gaming series uses 3 dword input buffer. */
++        u32 arg3; /* At least ROG Zephyrus G14 series uses 5 dword input buffer */
++        u32 arg4;
+ } __packed;
+ 
+ /*
+@@ -1722,7 +1724,7 @@ static ssize_t fan_boost_mode_store(struct device *dev,
+ 	asus->fan_boost_mode = new_mode;
+ 	fan_boost_mode_write(asus);
+ 
+-	return result;
++	return count;
+ }
+ 
+ // Fan boost mode: 0 - normal, 1 - overboost, 2 - silent