Applied suggested asuswmi patch

3 files changed, 42 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c4913015d09..a10949ccd008 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-amd
 	pkgver = 5.5.v.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -16,10 +16,12 @@ pkgbase = linux-amd
 	source = config.x86_64
 	source = linux-amd.preset
 	source = 5012_enable-cpu-optimizations-for-gcc91.patch
+	source = AsusBatPatch.patch
 	sha256sums = SKIP
 	sha256sums = 3baaeda116f798f827a2246a00bb4658ebde6a8406ab61e3ec4898b162dc6dd6
 	sha256sums = 71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08
 	sha256sums = cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370
+	sha256sums = 94cd6dddbc4e933d06345b5d0593bd827339c64bc8612af0e101cbea449861a3
 
 pkgname = linux-amd
 	pkgdesc = Linux kernel for AMD CPU based hardware
diff --git a/AsusBatPatch.patch b/AsusBatPatch.patch
new file mode 100644
index 000000000000..2d00c98543b0
--- /dev/null
+++ b/AsusBatPatch.patch
@@ -0,0 +1,26 @@
+From 95ab38a2ddb8a53b2b35b2b6cdcd71985769d966 Mon Sep 17 00:00:00 2001
+From: egnappahz <egnappah@gmail.com>
+Date: Tue, 18 Feb 2020 11:11:21 +0100
+Subject: [PATCH] Suggested Asus BatPatch
+
+Signed-off-by: egnappahz <egnappah@gmail.com>
+---
+ drivers/platform/x86/asus-wmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
+index 612ef5526226..12435e747a5d 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -427,7 +427,7 @@ static int asus_wmi_battery_add(struct power_supply *battery)
+ 	/* The WMI method does not provide a way to specific a battery, so we
+ 	 * just assume it is the first battery.
+ 	 */
+-	if (strcmp(battery->desc->name, "BAT0") != 0)
++	if ( (strcmp(battery->desc->name, "BAT0") != 0) && (strcmp(battery->desc->name, "BATT") != 0) )
+ 		return -ENODEV;
+ 
+ 	if (device_create_file(&battery->dev,
+-- 
+2.25.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 09d4d01907b8..2e61cee1369b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=linux-amd
 _srcname=linux
 gitver=v5.5.4
 pkgver=5.5.v.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -20,14 +20,20 @@ source=('git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
 	# patch from our gentoo overlords
-	5012_enable-cpu-optimizations-for-gcc91.patch)
+	5012_enable-cpu-optimizations-for-gcc91.patch
+	# patch for asus WMI
+	AsusBatPatch.patch
+)
 sha256sums=('SKIP'
              #config.x86_64
-            '3baaeda116f798f827a2246a00bb4658ebde6a8406ab61e3ec4898b162dc6dd6'
+             '3baaeda116f798f827a2246a00bb4658ebde6a8406ab61e3ec4898b162dc6dd6'
              #.preset file
              '71caf34adf69e9e2567a38cfc951d1c60b13dbe87f58a9acfeb3fe48ffdc9d08'
-             #patch file
-            'cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370'
+             #patch gentoo
+             'cc739c9c9f7ce08e6bbc161b8232208bbc00820342a32fb1f69bff6326ae1370'
+	     #Asusbat patchfile
+	     '94cd6dddbc4e933d06345b5d0593bd827339c64bc8612af0e101cbea449861a3'
+
            )
 
 _kernelname=${pkgbase#linux}
@@ -52,7 +58,8 @@ prepare() {
 
   # Implement cpu optimisation (MZEN2) patch from our gentoo lords
   git apply ../5012_enable-cpu-optimizations-for-gcc91.patch
-
+  # Implement suggested asus_wmi change
+  git apply ../AsusBatPatch.patch
   # get kernel version
   yes "" | make prepare