From 0a8ca19f8852fbc851f6f9f09d7ed2f09a15c9dd Mon Sep 17 00:00:00 2001
From: kiana-S <kiana.a.sheibani@gmail.com>
Date: Mon, 24 Jan 2022 22:46:33 -0500
Subject: [PATCH] Update linux kernel and patches to 5.16.2

---
 microsoft/surface/kernel/default.nix          |  2 +-
 .../default.nix                               | 46 ++++++++++---------
 .../linux-5.16.2.nix}                         |  4 +-
 3 files changed, 28 insertions(+), 24 deletions(-)
 rename microsoft/surface/kernel/{linux-5.13.4 => linux-5.16.2}/default.nix (67%)
 rename microsoft/surface/kernel/{linux-5.13.4/linux-5.13.4.nix => linux-5.16.2/linux-5.16.2.nix} (84%)

diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix
index 5eb6013..bcce3dd 100644
--- a/microsoft/surface/kernel/default.nix
+++ b/microsoft/surface/kernel/default.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
 
 {
-  boot.kernelPackages = pkgs.callPackage ./linux-5.13.4 { };
+  boot.kernelPackages = pkgs.callPackage ./linux-5.16.2 { };
 }
diff --git a/microsoft/surface/kernel/linux-5.13.4/default.nix b/microsoft/surface/kernel/linux-5.16.2/default.nix
similarity index 67%
rename from microsoft/surface/kernel/linux-5.13.4/default.nix
rename to microsoft/surface/kernel/linux-5.16.2/default.nix
index fe2b728..df85374 100644
--- a/microsoft/surface/kernel/linux-5.13.4/default.nix
+++ b/microsoft/surface/kernel/linux-5.16.2/default.nix
@@ -4,7 +4,7 @@ let
   patches = repos.linux-surface + "/patches";
   surface_kernelPatches = [
     {
-      name = "microsoft-surface-patches-linux-5.13.4";
+      name = "microsoft-surface-patches-linux-5.16.2";
       patch = null;
       structuredExtraConfig = with lib.kernel; {
         #
@@ -77,50 +77,54 @@ let
     }
     {
       name = "ms-surface/0001-surface3-oemb";
-      patch = patches + "/5.13/0001-surface3-oemb.patch";
+      patch = patches + "/5.16/0001-surface3-oemb.patch";
     }
     {
       name = "ms-surface/0002-mwifiex";
-      patch = patches + "/5.13/0002-mwifiex.patch";
+      patch = patches + "/5.16/0002-mwifiex.patch";
     }
     {
       name = "ms-surface/0003-ath10k";
-      patch = patches + "/5.13/0003-ath10k.patch";
+      patch = patches + "/5.16/0003-ath10k.patch";
     }
     {
       name = "ms-surface/0004-ipts";
-      patch = patches + "/5.13/0004-ipts.patch";
-    }
-    {
-      name = "ms-surface/0005-surface-sam-over-hid";
-      patch = patches + "/5.13/0005-surface-sam-over-hid.patch";
+      patch = patches + "/5.16/0004-ipts.patch";
     }
     {
       name = "ms-surface/0006-surface-sam";
-      patch = patches + "/5.13/0006-surface-sam.patch";
+      patch = patches + "/5.16/0006-surface-sam.patch";
     }
     {
-      name = "ms-surface/0007-surface-hotplug";
-      patch = patches + "/5.13/0007-surface-hotplug.patch";
+      name = "ms-surface/0006-surface-sam-over-hid";
+      patch = patches + "/5.16/0006-surface-sam-over-hid.patch";
     }
     {
-      name = "ms-surface/0008-surface-typecover";
-      patch = patches + "/5.13/0008-surface-typecover.patch";
+      name = "ms-surface/0007-surface-gpe";
+      patch = patches + "/5.16/0007-surface-gpe.patch";
     }
     {
-      name = "ms-surface/0009-cameras";
-      patch = patches + "/5.13/0009-cameras.patch";
+      name = "ms-surface/0008-surface-button";
+      patch = patches + "/5.16/0008-surface-button.patch";
     }
     {
-      name = "ms-surface/0010-amd-gpio";
-      patch = patches + "/5.13/0010-amd-gpio.patch";
+      name = "ms-surface/0009-surface-typecover";
+      patch = patches + "/5.16/0009-surface-typecover.patch";
     }
     {
-      name = "ms-surface/0011-amd-s0ix";
-      patch = patches + "/5.13/0011-amd-s0ix.patch";
+      name = "ms-surface/0010-cameras";
+      patch = patches + "/5.16/0010-cameras.patch";
+    }
+    {
+      name = "ms-surface/0011-amd-gpio";
+      patch = patches + "/5.16/0011-amd-gpio.patch";
+    }
+    {
+      name = "ms-surface/0012-misc-fixes";
+      patch = patches + "/5.16/0012-misc-fixes.patch";
     }
   ];
 in (with pkgs;
-  recurseIntoAttrs (linuxPackagesFor (callPackage ./linux-5.13.4.nix {
+  recurseIntoAttrs (linuxPackagesFor (callPackage ./linux-5.16.2.nix {
     kernelPatches = surface_kernelPatches;
   })))
diff --git a/microsoft/surface/kernel/linux-5.13.4/linux-5.13.4.nix b/microsoft/surface/kernel/linux-5.16.2/linux-5.16.2.nix
similarity index 84%
rename from microsoft/surface/kernel/linux-5.13.4/linux-5.13.4.nix
rename to microsoft/surface/kernel/linux-5.16.2/linux-5.16.2.nix
index 025d72e..1996658 100644
--- a/microsoft/surface/kernel/linux-5.13.4/linux-5.13.4.nix
+++ b/microsoft/surface/kernel/linux-5.16.2/linux-5.16.2.nix
@@ -4,7 +4,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.13.4";
+  version = "5.16.2";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then
@@ -17,6 +17,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "7192cd2f654aa6083451dea01b80748fe1eebcf2476a589ef4146590030e7d6c";
+    sha256 = "ra51jkdlpp33svjjv5cfibh6xr1ljji3dhz2g2lfn12rl2hmg0z";
   };
 } // (args.argsOverride or { }))