Merge branch 'master' into microsoft/surface/kernel-6.6

microsoft/surface/common/default.nix

@@ -10,7 +10,7 @@ in {
     ./surface-control
   ];
 
-  microsoft-surface.kernelVersion = mkDefault "6.6.2";
+  microsoft-surface.kernelVersion = mkDefault "6.6.8";
 
   # Seems to be required to properly enable S0ix "Modern Standby":
   boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];

microsoft/surface/common/ipts/default.nix

@@ -1,13 +1,33 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (lib) mkDefault mkEnableOption mkIf mkMerge;
+  inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption types;
 
   cfg = config.microsoft-surface.ipts;
 
-in {
+  iptsConfFile = pkgs.writeTextFile {
+    name = "iptsd.conf";
+    text = lib.generators.toINI { } cfg.config;
+  };
+
+in
+{
   options.microsoft-surface.ipts = {
     enable = mkEnableOption "Enable IPTSd for Microsoft Surface";
+
+    config = mkOption {
+      type = types.attrs;
+      default = { };
+      description = ''
+        Values to wrote to iptsd.conf, first key is section, second key is property.
+        See the example config; https://github.com/linux-surface/iptsd/blob/v1.4.0/etc/iptsd.conf
+      '';
+      example = ''
+        DFT = {
+          ButtonMinMag = 1000;
+        };
+      '';
+    };
   };
 
   config = mkMerge [
@@ -22,6 +42,7 @@ in {
         script = "iptsd $(iptsd-find-hidraw)";
         wantedBy = [ "multi-user.target" ];
       };
+      environment.etc."iptsd/iptsd.conf".source = "${iptsConfFile}";
     })
   ];
 }

microsoft/surface/common/kernel/default.nix

@@ -6,7 +6,6 @@ let
 in {
   imports = [
     ./linux-6.1.x
-    ./linux-6.5.x
     ./linux-6.6.x
   ];
 

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

@@ -27,10 +27,10 @@ let
 
 in {
   options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ version ];
+    type = types.enum [ version majorVersion ];
   };
 
-  config = mkIf (cfg.kernelVersion == version ) {
+  config = mkIf (cfg.kernelVersion == version || cfg.kernelVersion == majorVersion) {
     boot = {
       inherit kernelPackages;
     };

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

@@ -1,38 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkOption types;
-  inherit (pkgs) fetchurl;
-
-  inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage1 repos;
-
-  cfg = config.microsoft-surface;
-
-  version = "6.5.11";
-  extraMeta.branch = "6.5";
-  patchSrc = repos.linux-surface + "/patches/${extraMeta.branch}";
-  kernelPatches = pkgs.callPackage ./patches.nix {
-    inherit (lib) kernel;
-    inherit version patchSrc;
-  };
-
-  kernelPackages = linuxPackage1 {
-    inherit version extraMeta kernelPatches;
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-      sha256 = "sha256-LuJK+SgrgJI7LaVrcKrX3y6O5OPwdkUuBbpmviBZtRk=";
-    };
-  };
-
-
-in {
-  options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ version ];
-  };
-
-  config = mkIf (cfg.kernelVersion == version) {
-    boot = {
-      inherit kernelPackages;
-    };
-  };
-}

microsoft/surface/common/kernel/linux-6.5.x/patches.nix

@@ -1,143 +0,0 @@
-{ lib,
-  kernel ? lib.kernel,
-  patchSrc,
-  version,
-}:
-
-[
-  {
-    name = "microsoft-surface-patches-linux-${version}";
-    patch = null;
-    structuredExtraConfig = with kernel; {
-      STREAMING_MEDIA = yes;
-
-      #
-      # Surface Aggregator Module
-      #
-      SURFACE_AGGREGATOR = module;
-      SURFACE_AGGREGATOR_ERROR_INJECTION = no;
-      SURFACE_AGGREGATOR_BUS = yes;
-      SURFACE_AGGREGATOR_CDEV = module;
-      SURFACE_AGGREGATOR_HUB = module;
-      SURFACE_AGGREGATOR_REGISTRY = module;
-      SURFACE_AGGREGATOR_TABLET_SWITCH = 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;
-
-      #
-      # Intel Touch Host Controller
-      #
-      HID_ITHC = 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_DW9719 = module;
-      VIDEO_IPU3_IMGU = module;
-      VIDEO_IPU3_CIO2 = module;
-      CIO2_BRIDGE = yes;
-      INTEL_SKL_INT3472 = module;
-      REGULATOR_TPS68470 = module;
-      COMMON_CLK_TPS68470 = module;
-      COMMON_LEDS_TPS68470 = module;
-
-      #
-      # Cameras: Sensor drivers
-      #
-      VIDEO_OV5693 = module;
-      VIDEO_OV7251 = 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_POWER_OPREGION = module;
-      SURFACE_PRO3_BUTTON = module;
-      SURFACE_GPE = module;
-      SURFACE_BOOK1_DGPU_SWITCH = module;
-    };
-  }
-  {
-    name = "ms-surface/0001-surface3-oemb";
-    patch = patchSrc + "/0001-surface3-oemb.patch";
-  }
-  {
-    name = "ms-surface/0002-mwifiex";
-    patch = patchSrc + "/0002-mwifiex.patch";
-  }
-  {
-    name = "ms-surface/0003-ath10k";
-    patch = patchSrc + "/0003-ath10k.patch";
-  }
-  {
-    name = "ms-surface/0004-ipts";
-    patch = patchSrc + "/0004-ipts.patch";
-  }
-  {
-    name = "ms-surface/0005-ithc";
-    patch = patchSrc + "/0005-ithc.patch";
-  }
-  {
-    name = "ms-surface/0006-surface-sam";
-    patch = patchSrc + "/0006-surface-sam.patch";
-  }
-  {
-    name = "ms-surface/0007-surface-sam-over-hid";
-    patch = patchSrc + "/0007-surface-sam-over-hid.patch";
-  }
-  {
-    name = "ms-surface/0008-surface-button";
-    patch = patchSrc + "/0008-surface-button.patch";
-  }
-  {
-    name = "ms-surface/0009-surface-typecover";
-    patch = patchSrc + "/0009-surface-typecover.patch";
-  }
-  {
-    name = "ms-surface/0010-surface-shutdown";
-    patch = patchSrc + "/0010-surface-shutdown.patch";
-  }
-  {
-    name = "ms-surface/0011-surface-gpe";
-    patch = patchSrc + "/0011-surface-gpe.patch";
-  }
-  {
-    name = "ms-surface/0012-cameras";
-    patch = patchSrc + "/0012-cameras.patch";
-  }
-  {
-    name = "ms-surface/0013-amd-gpio";
-    patch = patchSrc + "/0013-amd-gpio.patch";
-  }
-  {
-    name = "ms-surface/0014-rtc";
-    patch = patchSrc + "/0014-rtc.patch";
-  }
-]

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

@@ -7,14 +7,14 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.6.2";
+  version = "6.6.8";
   kernelPatches = surfacePatches {
     inherit version;
     patchFn = ./patches.nix;
   };
   kernelPackages = linuxPackage2 {
     inherit version kernelPatches;
-    sha256 = "sha256-c9T2rY3WrCpB7VLCkoiYt8PyUZ7V29sRkgIJo2mZt34=";
+    sha256 = "sha256-UDbENOEeSzbY2j9ImFH3+CnPeF+n94h0aFN6nqRXJBY=";
   };
 
 in {

microsoft/surface/common/repos.nix

@@ -4,8 +4,8 @@
   linux-surface = fetchFromGitHub {
     owner = "linux-surface";
     repo = "linux-surface";
-    rev = "a6eafcad32dc789ae92f42636b11e9aae6e7c879"; #b82e8acd3c015190423b114770b0e9fcc206dd2d";
-    hash = "sha256-GfxRzxFxDZoSZyEOzxr/Hz0IonbuwzkGaisKl3VYvlI="; #sha256-parp1F5fFzKkiM6ILK+ZolMdSwU1kLOOMvksSwE/zKA=";
+    rev = "arch-6.6.6-1";
+    hash = "sha256-0pP/A0XllR/iheIBEBwEApaXpyFYzsnGZ+wdm4w5Jjg=";
   };
 
   # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: