Merge remote-tracking branch 'upstream/master' into microsoft/surface/6.1.3

microsoft/surface/default.nix

@@ -9,7 +9,7 @@ in {
     ./firmware/surface-go/ath10k
   ];
 
-  microsoft-surface.kernelVersion = mkDefault "6.0.11";
+  microsoft-surface.kernelVersion = mkDefault "6.0.17";
 
   boot.extraModprobeConfig = mkDefault ''
     options i915 enable_fbc=1 enable_rc6=1 modeset=1

microsoft/surface/kernel/default.nix

@@ -6,7 +6,7 @@ let
 in {
   imports = [
     ./linux-5.19.17
-    ./linux-6.0.11
+    ./linux-6.0.17
     ./linux-6.1.3
   ];
 

microsoft/surface/kernel/linux-6.0.17/default.nix

@@ -8,7 +8,7 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.0.11";
+  version = "6.0.17";
   extraMeta.branch = "6.0";
   patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
   kernelPatches = pkgs.callPackage ./patches.nix {
@@ -20,17 +20,17 @@ let
     inherit version extraMeta kernelPatches;
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-      sha256 = "sha256-K65hMeZJceHjT/OV+lQpcRNMhXvbCykGmrhHx8mpx2I=";
+      sha256 = "sha256-p+6SCSpUWbtGq/C1RJpOV+i3klkaxOesBO0lQtLOHQg=";
     };
   };
 
 
 in {
   options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ "6.0.11" ];
+    type = types.enum [ "6.0.17" ];
   };
 
-  config = mkIf (cfg.kernelVersion == "6.0.11") {
+  config = mkIf (cfg.kernelVersion == "6.0.17") {
     boot = {
       inherit kernelPackages;
     };

microsoft/surface/kernel/linux-6.0.17/patches.nix

@@ -111,8 +111,12 @@
     name = "ms-surface/0009-cameras";
     patch = patchDir + "/0009-cameras.patch";
   }
-  # {
-  #   name = "ms-surface/0010-amd-gpio";
-  #   patch = patchDir + "/0010-amd-gpio.patch";
-  # }
+  {
+    name = "ms-surface/0010-amd-gpio";
+    patch = patchDir + "/0010-amd-gpio.patch";
+  }
+  {
+    name = "ms-surface/0011-rtc";
+    patch = patchDir + "/0011-rtc.patch";
+  }
 ]