linux_surface 5.10.19->5.13.4

microsoft/surface/kernel/default.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
 
 {
-  boot.kernelPackages = pkgs.callPackage ./linux-5.10.19 {};
+  boot.kernelPackages = pkgs.callPackage ./linux-5.13.4 { };
 }

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

@@ -1,125 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  repos = (pkgs.callPackage ../../repos.nix {});
-  patches = repos.linux-surface + "/patches";
-  surface_kernelPatches = [
-    { name = "microsoft-surface-patches-linux-5.10.19";
-      patch = null;
-      extraConfig = ''
-          #
-          # Surface Aggregator Module
-          #
-          SURFACE_AGGREGATOR m
-          SURFACE_AGGREGATOR_ERROR_INJECTION n
-          SURFACE_AGGREGATOR_BUS y
-          SURFACE_AGGREGATOR_CDEV m
-          SURFACE_AGGREGATOR_REGISTRY m
-
-          SURFACE_ACPI_NOTIFY m
-          SURFACE_DTX m
-          SURFACE_PERFMODE m
-
-          SURFACE_HID m
-          SURFACE_KBD m
-
-          BATTERY_SURFACE m
-          CHARGER_SURFACE m
-
-          #
-          # These built-in modules are required for the Surface Aggregator Module
-          # See: https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing
-          #
-          SERIAL_DEV_BUS y
-          SERIAL_DEV_CTRL_TTYPORT y
-
-          #
-          # Surface Hotplug
-          #
-          SURFACE_HOTPLUG m
-
-          #
-          # IPTS touchscreen
-          #
-          # This only enables the user interface for IPTS data.
-          # For the touchscreen to work, you need to install iptsd.
-          #
-          MISC_IPTS m
-
-          #
-          # Cameras: IPU3
-          #
-          ## Not yet supported in the patches
-          # VIDEO_IPU3_IMGU m
-          VIDEO_IPU3_CIO2 m
-          CIO2_BRIDGE y
-          INTEL_SKL_INT3472 m
-
-          #
-          # Cameras: Sensor drivers
-          #
-          VIDEO_OV5693 m
-          ## Not yet supported in the patches
-          # VIDEO_OV8865 m
-
-          #
-          # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-          #
-          APDS9960 m
-
-          #
-          # Other Drivers
-          #
-          INPUT_SOC_BUTTON_ARRAY m
-          SURFACE_3_BUTTON m
-          SURFACE_3_POWER_OPREGION m
-          SURFACE_PRO3_BUTTON m
-          SURFACE_GPE m
-          SURFACE_BOOK1_DGPU_SWITCH m
-        '';
-    }
-    {
-      name = "ms-surface/0001-surface3-oemb";
-      patch = patches + "/5.10/0001-surface3-oemb.patch";
-    }
-    {
-      name = "ms-surface/0002-wifi";
-      patch = patches + "/5.10/0002-wifi.patch";
-    }
-    {
-      name = "ms-surface/0003-ipts";
-      patch = patches + "/5.10/0003-ipts.patch";
-    }
-    {
-      name = "ms-surface/0004-surface-gpe";
-      patch = patches + "/5.10/0004-surface-gpe.patch";
-    }
-    {
-      name = "ms-surface/0005-surface-sam-over-hid";
-      patch = patches + "/5.10/0005-surface-sam-over-hid.patch";
-    }
-    {
-      name = "ms-surface/0006-surface-sam";
-      patch = patches + "/5.10/0006-surface-sam.patch";
-    }
-    {
-      name = "ms-surface/0007-surface-hotplug";
-      patch = patches + "/5.10/0007-surface-hotplug.patch";
-    }
-    {
-      name = "ms-surface/0008-surface-typecover";
-      patch = patches + "/5.10/0008-surface-typecover.patch";
-    }
-    {
-      name = "ms-surface/0009-surface-sensors";
-      patch = patches + "/5.10/0009-surface-sensors.patch";
-    }
-    {
-      name = "ms-surface/0010-cameras";
-      patch = patches + "/5.10/0010-cameras.patch";
-    }
-  ];
-in (with pkgs; recurseIntoAttrs (linuxPackagesFor (
-     callPackage ./linux-5.10.19.nix {
-       kernelPatches = surface_kernelPatches;
-     }
-   )))

microsoft/surface/kernel/linux-5.10.19/linux-5.10.19.nix

@@ -1,18 +0,0 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with lib;
-
-buildLinux (args // rec {
-  version = "5.10.19";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = versions.majorMinor version;
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1mml5a30ky0khzj3r6ahybycbbszk86agq62qclwq2kzvsqbprr7";
-  };
-} // (args.argsOverride or {}))

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

@@ -0,0 +1,120 @@
+{ config, lib, pkgs, ... }:
+let
+  repos = (pkgs.callPackage ../../repos.nix { });
+  patches = repos.linux-surface + "/patches";
+  surface_kernelPatches = [
+    {
+      name = "microsoft-surface-patches-linux-5.13.4";
+      patch = null;
+      structuredExtraConfig = with lib.kernel; {
+        #
+        # Surface Aggregator Module
+        #
+        SURFACE_AGGREGATOR = module;
+        SURFACE_AGGREGATOR_ERROR_INJECTION = no;
+        SURFACE_AGGREGATOR_BUS = yes;
+        SURFACE_AGGREGATOR_CDEV = module;
+        SURFACE_AGGREGATOR_REGISTRY = module;
+
+        SURFACE_ACPI_NOTIFY = module;
+        SURFACE_DTX = module;
+        SURFACE_PLATFORM_PROFILE = module;
+
+        SURFACE_HID = module;
+        SURFACE_KBD = module;
+
+        BATTERY_SURFACE = module;
+        CHARGER_SURFACE = module;
+
+        #
+        # Surface Hotplug
+        #
+        SURFACE_HOTPLUG = module;
+
+        #
+        # IPTS touchscreen
+        #
+        # This only enables the user interface for IPTS data.
+        # For the touchscreen to work, you need to install iptsd.
+        #
+        MISC_IPTS = module;
+
+        #
+        # Cameras: IPU3
+        #
+        VIDEO_IPU3_IMGU = module;
+        VIDEO_IPU3_CIO2 = module;
+        CIO2_BRIDGE = yes;
+        INTEL_SKL_INT3472 = module;
+
+        #
+        # Cameras: Sensor drivers
+        #
+        VIDEO_OV5693 = module;
+        VIDEO_OV8865 = module;
+
+        #
+        # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+        #
+        APDS9960 = module;
+
+        #
+        # Other Drivers
+        #
+        INPUT_SOC_BUTTON_ARRAY = module;
+        SURFACE_3_BUTTON = module;
+        SURFACE_3_POWER_OPREGION = module;
+        SURFACE_PRO3_BUTTON = module;
+        SURFACE_GPE = module;
+        SURFACE_BOOK1_DGPU_SWITCH = module;
+      };
+    }
+    {
+      name = "ms-surface/0001-surface3-oemb";
+      patch = patches + "/5.13/0001-surface3-oemb.patch";
+    }
+    {
+      name = "ms-surface/0002-mwifiex";
+      patch = patches + "/5.13/0002-mwifiex.patch";
+    }
+    {
+      name = "ms-surface/0003-ath10k";
+      patch = patches + "/5.13/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";
+    }
+    {
+      name = "ms-surface/0006-surface-sam";
+      patch = patches + "/5.13/0006-surface-sam.patch";
+    }
+    {
+      name = "ms-surface/0007-surface-hotplug";
+      patch = patches + "/5.13/0007-surface-hotplug.patch";
+    }
+    {
+      name = "ms-surface/0008-surface-typecover";
+      patch = patches + "/5.13/0008-surface-typecover.patch";
+    }
+    {
+      name = "ms-surface/0009-cameras";
+      patch = patches + "/5.13/0009-cameras.patch";
+    }
+    {
+      name = "ms-surface/0010-amd-gpio";
+      patch = patches + "/5.13/0010-amd-gpio.patch";
+    }
+    {
+      name = "ms-surface/0011-amd-s0ix";
+      patch = patches + "/5.13/0011-amd-s0ix.patch";
+    }
+  ];
+in (with pkgs;
+  recurseIntoAttrs (linuxPackagesFor (callPackage ./linux-5.13.4.nix {
+    kernelPatches = surface_kernelPatches;
+  })))

microsoft/surface/kernel/linux-5.13.4/linux-5.13.4.nix

@@ -0,0 +1,22 @@
+{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux
+, modDirVersionArg ? null, ... }@args:
+
+with lib;
+
+buildLinux (args // rec {
+  version = "5.13.4";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then
+    concatStringsSep "." (take 3 (splitVersion "${version}.0"))
+  else
+    modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = versions.majorMinor version;
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+    sha256 = "7192cd2f654aa6083451dea01b80748fe1eebcf2476a589ef4146590030e7d6c";
+  };
+} // (args.argsOverride or { }))

microsoft/surface/repos.nix

@@ -1,17 +1,16 @@
-{ lib, pkgs, fetchFromGitHub, fetchurl }:
+{ lib, pkgs, fetchFromGitHub, fetchurl }: {
-{
   linux-surface = fetchFromGitHub {
     owner = "linux-surface";
     repo = "linux-surface";
-    rev="f8fab978a480a4ed57e9ebb6928683b2e443c1c5";
+    rev = "4130746c31606aebaccef58997b650beda9049f7";
-    sha256="0zwybprwjckpapxm6gxzh6hwdd1w91g5sjxn6z52zlvvjpkmw959";
+    sha256 = "0r74z0hj3rg8bn2arh2zj8p7awk7fi14gpyrs5h44lwxw4351xky";
   };
 
   ath10k-firmware = fetchFromGitHub {
     owner = "kvalo";
     repo = "ath10k-firmware";
-    rev="84b47062aab31d67156e0a3ef593a6999a12864b";
+    rev = "c987e38cbdb90dcb4e477d5dd21de66c77996435";
-    sha256="0l8wfj8z4jbb31nzqkaxisby0n6061ix01c5di9bq66iby59j8py";
+    sha256 = "16a67baxlga8vb43zbby2s7kpp4488vczg3manmr9g3wxnhhb9n3";
   };
 
   surface-go-ath10k-firmware_upstream = fetchurl {