From afc5a2949bb79c43d06b0e8ff4679f408be85106 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Thu, 5 Oct 2023 15:55:13 +0200
Subject: [PATCH] surface: linux 6.4.16 -> 6.5.5

---
 microsoft/surface/common/default.nix          |  2 +-
 microsoft/surface/common/kernel/default.nix   |  2 +-
 .../{linux-6.4.16 => linux-6.5.5}/default.nix | 10 +++---
 .../{linux-6.4.16 => linux-6.5.5}/patches.nix | 36 ++++++++++---------
 4 files changed, 27 insertions(+), 23 deletions(-)
 rename microsoft/surface/common/kernel/{linux-6.4.16 => linux-6.5.5}/default.nix (77%)
 rename microsoft/surface/common/kernel/{linux-6.4.16 => linux-6.5.5}/patches.nix (73%)

diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix
index 69e0d69..29ae5dc 100644
--- a/microsoft/surface/common/default.nix
+++ b/microsoft/surface/common/default.nix
@@ -10,7 +10,7 @@ in {
     ./surface-control
   ];
 
-  microsoft-surface.kernelVersion = mkDefault "6.4.16";
+  microsoft-surface.kernelVersion = mkDefault "6.5.5";
 
   # Seems to be required to properly enable S0ix "Modern Standby":
   boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];
diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix
index b135251..0799b46 100644
--- a/microsoft/surface/common/kernel/default.nix
+++ b/microsoft/surface/common/kernel/default.nix
@@ -5,8 +5,8 @@ let
 
 in {
   imports = [
-    ./linux-6.4.16
     ./linux-6.1.55
+    ./linux-6.5.5
   ];
 
   options.microsoft-surface.kernelVersion = mkOption {
diff --git a/microsoft/surface/common/kernel/linux-6.4.16/default.nix b/microsoft/surface/common/kernel/linux-6.5.5/default.nix
similarity index 77%
rename from microsoft/surface/common/kernel/linux-6.4.16/default.nix
rename to microsoft/surface/common/kernel/linux-6.5.5/default.nix
index abdcf74..485063a 100644
--- a/microsoft/surface/common/kernel/linux-6.4.16/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.5.5/default.nix
@@ -8,8 +8,8 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.4.16";
-  extraMeta.branch = "6.4";
+  version = "6.5.5";
+  extraMeta.branch = "6.5";
   patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
   kernelPatches = pkgs.callPackage ./patches.nix {
     inherit (lib) kernel;
@@ -20,17 +20,17 @@ let
     inherit version extraMeta kernelPatches;
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-      sha256 = "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln";
+      sha256 = "15gg8sb6cfgk1afwj7fl7mj4nkj14w43vzwvw0qsg3nzyxwh7wcc";
     };
   };
 
 
 in {
   options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ "6.4.16" ];
+    type = types.enum [ "6.5.5" ];
   };
 
-  config = mkIf (cfg.kernelVersion == "6.4.16") {
+  config = mkIf (cfg.kernelVersion == "6.5.5") {
     boot = {
       inherit kernelPackages;
     };
diff --git a/microsoft/surface/common/kernel/linux-6.4.16/patches.nix b/microsoft/surface/common/kernel/linux-6.5.5/patches.nix
similarity index 73%
rename from microsoft/surface/common/kernel/linux-6.4.16/patches.nix
rename to microsoft/surface/common/kernel/linux-6.5.5/patches.nix
index 433ed15..d7b9289 100644
--- a/microsoft/surface/common/kernel/linux-6.4.16/patches.nix
+++ b/microsoft/surface/common/kernel/linux-6.5.5/patches.nix
@@ -104,35 +104,39 @@
     patch = patchDir + "/0005-ithc.patch";
   }
   {
-    name = "ms-surface/0006-surface-sam-over-hid";
-    patch = patchDir + "/0006-surface-sam-over-hid.patch";
+    name = "ms-surface/0006-surface-sam";
+    patch = patchDir + "/0006-surface-sam.patch";
   }
   {
-    name = "ms-surface/0007-surface-button";
-    patch = patchDir + "/0007-surface-button.patch";
+    name = "ms-surface/0007-surface-sam-over-hid";
+    patch = patchDir + "/0007-surface-sam-over-hid.patch";
   }
   {
-    name = "ms-surface/0008-surface-typecover";
-    patch = patchDir + "/0008-surface-typecover.patch";
+    name = "ms-surface/0008-surface-button";
+    patch = patchDir + "/0008-surface-button.patch";
   }
   {
-    name = "ms-surface/0009-surface-shutdown";
-    patch = patchDir + "/0009-surface-shutdown.patch";
+    name = "ms-surface/0009-surface-typecover";
+    patch = patchDir + "/0009-surface-typecover.patch";
   }
   {
-    name = "ms-surface/0010-surface-gpe";
-    patch = patchDir + "/0010-surface-gpe.patch";
+    name = "ms-surface/0010-surface-shutdown";
+    patch = patchDir + "/0010-surface-shutdown.patch";
   }
   {
-    name = "ms-surface/0011-cameras";
-    patch = patchDir + "/0011-cameras.patch";
+    name = "ms-surface/0011-surface-gpe";
+    patch = patchDir + "/0011-surface-gpe.patch";
   }
   {
-    name = "ms-surface/0012-amd-gpio";
-    patch = patchDir + "/0012-amd-gpio.patch";
+    name = "ms-surface/0012-cameras";
+    patch = patchDir + "/0012-cameras.patch";
   }
   {
-    name = "ms-surface/0013-rtc";
-    patch = patchDir + "/0013-rtc.patch";
+    name = "ms-surface/0013-amd-gpio";
+    patch = patchDir + "/0013-amd-gpio.patch";
+  }
+  {
+    name = "ms-surface/0014-rtc";
+    patch = patchDir + "/0014-rtc.patch";
   }
 ]