diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index b6b00ee..3f4d86a 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.5.11"; + microsoft-surface.kernelVersion = mkDefault "6.6.6"; # 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 a0637a3..992ec9b 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -6,7 +6,7 @@ let in { imports = [ ./linux-6.1.x - ./linux-6.5.x + ./linux-6.6.x ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.5.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix similarity index 87% rename from microsoft/surface/common/kernel/linux-6.5.x/default.nix rename to microsoft/surface/common/kernel/linux-6.6.x/default.nix index ba3c2a0..6573522 100644 --- a/microsoft/surface/common/kernel/linux-6.5.x/default.nix +++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix @@ -8,8 +8,8 @@ let cfg = config.microsoft-surface; - version = "6.5.11"; - majorVersion = "6.5"; + version = "6.6.6"; + majorVersion = "6.6"; patchDir = repos.linux-surface + "/patches/${majorVersion}"; kernelPatches = pkgs.callPackage ./patches.nix { inherit (lib) kernel; @@ -21,7 +21,7 @@ let extraMeta.branch = majorVersion; src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-LuJK+SgrgJI7LaVrcKrX3y6O5OPwdkUuBbpmviBZtRk="; + sha256 = "sha256-6/cKkXk0sTFp4b5blcO2wv6lvBTm3BRPHvuKABayJMg="; }; }; diff --git a/microsoft/surface/common/kernel/linux-6.5.x/patches.nix b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix similarity index 99% rename from microsoft/surface/common/kernel/linux-6.5.x/patches.nix rename to microsoft/surface/common/kernel/linux-6.6.x/patches.nix index d7b9289..40264ad 100644 --- a/microsoft/surface/common/kernel/linux-6.5.x/patches.nix +++ b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix @@ -55,7 +55,7 @@ VIDEO_DW9719 = module; VIDEO_IPU3_IMGU = module; VIDEO_IPU3_CIO2 = module; - CIO2_BRIDGE = yes; + IPU_BRIDGE = module; INTEL_SKL_INT3472 = module; REGULATOR_TPS68470 = module; COMMON_CLK_TPS68470 = module; diff --git a/microsoft/surface/common/repos.nix b/microsoft/surface/common/repos.nix index 15dc30d..cfaf9e0 100644 --- a/microsoft/surface/common/repos.nix +++ b/microsoft/surface/common/repos.nix @@ -4,8 +4,8 @@ linux-surface = fetchFromGitHub { owner = "linux-surface"; repo = "linux-surface"; - rev = "arch-6.6.1-1"; - hash = "sha256-GfxRzxFxDZoSZyEOzxr/Hz0IonbuwzkGaisKl3VYvlI="; + rev = "arch-6.6.4-1"; + hash = "sha256-uVNXwclBH72XeAgPWQr0I7lkhP+uGVlkT5N2xcBzbW4="; }; # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: