microsoft/surface: add kernel switching for LTS and latest kernels

microsoft/surface/common/kernel/6.13/patches.nix

@@ -0,0 +1,157 @@
+{ lib,
+  kernel ? lib.kernel,
+  patchSrc,
+  version,
+}:
+
+[
+  {
+    name = "microsoft-surface-patches-linux-${version}";
+    patch = null;
+    extraStructuredConfig = with kernel; {
+      STAGING_MEDIA = yes;
+
+##
+## Surface Aggregator Module
+##
+CONFIG_SURFACE_AGGREGATOR= module;
+# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
+CONFIG_SURFACE_AGGREGATOR_BUS= yes;
+CONFIG_SURFACE_AGGREGATOR_CDEV= module;
+CONFIG_SURFACE_AGGREGATOR_HUB= module;
+CONFIG_SURFACE_AGGREGATOR_REGISTRY= module;
+CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH= module;
+
+CONFIG_SURFACE_ACPI_NOTIFY= module;
+CONFIG_SURFACE_DTX= module;
+CONFIG_SURFACE_PLATFORM_PROFILE= module;
+
+CONFIG_SURFACE_HID= module;
+CONFIG_SURFACE_KBD= module;
+
+CONFIG_BATTERY_SURFACE= module;
+CONFIG_CHARGER_SURFACE= module;
+
+CONFIG_SENSORS_SURFACE_TEMP= module;
+CONFIG_SENSORS_SURFACE_FAN= module;
+
+##
+## Surface Hotplug
+##
+CONFIG_SURFACE_HOTPLUG= module;
+
+##
+## IPTS and ITHC touchscreen
+##
+## This only enables the user interface for IPTS/ITHC data.
+## For the touchscreen to work, you need to install iptsd.
+##
+CONFIG_HID_IPTS= module;
+CONFIG_HID_ITHC= module;
+
+##
+## Cameras: IPU3
+##
+CONFIG_VIDEO_DW9719= module;
+CONFIG_VIDEO_IPU3_IMGU= module;
+CONFIG_VIDEO_IPU3_CIO2= module;
+CONFIG_IPU_BRIDGE= module;
+CONFIG_INTEL_SKL_INT3472= module;
+CONFIG_REGULATOR_TPS68470= module;
+CONFIG_COMMON_CLK_TPS68470= module;
+CONFIG_LEDS_TPS68470= module;
+
+##
+## Cameras: Sensor drivers
+##
+CONFIG_VIDEO_OV5693= module;
+CONFIG_VIDEO_OV7251= module;
+CONFIG_VIDEO_OV8865= module;
+
+##
+## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
+##
+# CONFIG_INTEL_ATOMISP is not set
+
+##
+## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+##
+CONFIG_APDS9960= module;
+
+##
+## Build-in UFS support (required for some Surface Go devices)
+##
+CONFIG_SCSI_UFSHCD= module;
+CONFIG_SCSI_UFSHCD_PCI= module;
+
+##
+## Other Drivers
+##
+CONFIG_INPUT_SOC_BUTTON_ARRAY= module;
+CONFIG_SURFACE_3_POWER_OPREGION= module;
+CONFIG_SURFACE_PRO3_BUTTON= module;
+CONFIG_SURFACE_GPE= module;
+CONFIG_SURFACE_BOOK1_DGPU_SWITCH= module;
+    };
+  }
+  {
+    name = "ms-surface/0001-secureboot";
+    patch = patchSrc + "/0001-secureboot.patch";
+  }
+  {
+    name = "ms-surface/0002-surface3";
+    patch = patchSrc + "/0002-surface3.patch";
+  }
+  {
+    name = "ms-surface/0003-mwifiex";
+    patch = patchSrc + "/0003-mwifiex.patch";
+  }
+  {
+    name = "ms-surface/0004-ath10k";
+    patch = patchSrc + "/0004-ath10k.patch";
+  }
+  {
+    name = "ms-surface/0005-ipts";
+    patch = patchSrc + "/0005-ipts.patch";
+  }
+  {
+    name = "ms-surface/0006-ithc";
+    patch = patchSrc + "/0006-ithc.patch";
+  }
+  {
+    name = "ms-surface/0007-surface-sam";
+    patch = patchSrc + "/0007-surface-sam.patch";
+  }
+  {
+    name = "ms-surface/0008-surface-sam-over-hid";
+    patch = patchSrc + "/0008-surface-sam-over-hid.patch";
+  }
+  {
+    name = "ms-surface/0009-surface-button";
+    patch = patchSrc + "/0009-surface-button.patch";
+  }
+  {
+    name = "ms-surface/0010-surface-typecover";
+    patch = patchSrc + "/0010-surface-typecover.patch";
+  }
+  {
+    name = "ms-surface/0011-surface-shutdown";
+    patch = patchSrc + "/0011-surface-shutdown.patch";
+  }
+  {
+    name = "ms-surface/0012-surface-gpe";
+    patch = patchSrc + "/0012-surface-gpe.patch";
+  }
+  {
+    name = "ms-surface/0013-cameras";
+    patch = patchSrc + "/0013-cameras.patch";
+  }
+  {
+    name = "ms-surface/0014-amd-gpio";
+    patch = patchSrc + "/0014-amd-gpio.patch";
+  }
+  {
+    name = "ms-surface/0015-rtc";
+    patch = patchSrc + "/0015-rtc.patch";
+  }
+]

microsoft/surface/common/kernel/default.nix

@@ -1,15 +0,0 @@
-{ lib, ... }:
-
-let
-  inherit (lib) mkOption types;
-
-in {
-  imports = [
-    ./linux-surface
-  ];
-
-  options.microsoft-surface.kernelVersion = mkOption {
-    description = "Kernel Version to use (patched for MS Surface)";
-    type = types.enum [ ];
-  };
-}

microsoft/surface/common/kernel/linux-package.nix

@@ -3,14 +3,13 @@
   fetchurl,
   buildLinux,
   linuxPackagesFor,
+  repos,
 }:
 
 let
   inherit (builtins) elem;
   inherit (lib) recurseIntoAttrs types versions;
 
-  repos = pkgs.callPackage ../repos.nix {};
-
   linuxPackage =
     { url ? "mirror://kernel/linux/kernel/v${versions.major version}.x/linux-${version}.tar.xz",
       sha256 ? null,

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

@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkOption;
-
-  inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches isVersionOf versionsOfEnum;
-
-  cfg = config.microsoft-surface;
-
-  version = "6.12.19";
-  kernelPatches = surfacePatches {
-    inherit version;
-    patchFn = ./patches.nix;
-  };
-  kernelPackages = linuxPackage {
-    inherit version kernelPatches;
-    sha256 = "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=";
-    ignoreConfigErrors=true;
-  };
-
-in {
-  options.microsoft-surface.kernelVersion = mkOption {
-    type = versionsOfEnum version;
-  };
-
-  config = mkIf (isVersionOf cfg.kernelVersion version) {
-    boot = {
-      inherit kernelPackages;
-    };
-  };
-}

microsoft/surface/common/kernel/repos.nix

@@ -0,0 +1,9 @@
+{ fetchFromGitHub, rev, hash }:
+{
+  linux-surface = fetchFromGitHub {
+    owner = "linux-surface";
+    repo = "linux-surface";
+    rev = rev;
+    hash = hash;
+  };
+}