aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge #597 #599

Browse source 
597: microsoft-surface: upgrade kernel 6.1.6 to 6.1.18 r=Mic92 a=jokogr



599: fix: add missing touch-ft5406 export to raspberry-pi config r=Mic92 a=louib



Co-authored-by: Ioannis Koutras <ioannis.koutras@gmail.com>
Co-authored-by: louib <code@louib.net>
This commit is contained in:
bors[bot] 2023-03-29 06:12:10 +00:00 committed by GitHub
parent 0e55a5963e 39fb4bb20e b7c184da76
commit a6aa8174fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
microsoft/surface/common/kernel/default.nix
View file

@ -7,7 +7,7 @@ in {
imports = [ imports = [
./linux-5.19.17 ./linux-5.19.17
./linux-6.0.17 ./linux-6.0.17
./linux-6.1.6 ./linux-6.1.18
]; ];
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {

8
microsoft/surface/common/kernel/linux-6.1.6/default.nix → microsoft/surface/common/kernel/linux-6.1.18/default.nix
View file

@ -8,7 +8,7 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.1.6"; version = "6.1.18";
extraMeta.branch = "6.1"; extraMeta.branch = "6.1";
patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
kernelPatches = pkgs.callPackage ./patches.nix { kernelPatches = pkgs.callPackage ./patches.nix {
@ -20,17 +20,17 @@ let
inherit version extraMeta kernelPatches; inherit version extraMeta kernelPatches;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM="; sha256 = "sha256-hCrBXv8Ob7DBUP34P09qr2tMEjnc+MFOIidiDsCuFB4=";
}; };
}; };
in { in {
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {
type = types.enum [ "6.1.6" ]; type = types.enum [ "6.1.18" ];
}; };
config = mkIf (cfg.kernelVersion == "6.1.6") { config = mkIf (cfg.kernelVersion == "6.1.18") {
boot = { boot = {
inherit kernelPackages; inherit kernelPackages;
}; };

49
microsoft/surface/common/kernel/linux-6.1.6/patches.nix → microsoft/surface/common/kernel/linux-6.1.18/patches.nix
View file

@ -36,6 +36,11 @@
# #
SURFACE_HOTPLUG = module; SURFACE_HOTPLUG = module;
#
# Intel Touch Host Controller
#
HID_ITHC = module;
# #
# IPTS touchscreen # IPTS touchscreen
# #
@ -94,31 +99,47 @@
patch = patchDir + "/0004-ipts.patch"; patch = patchDir + "/0004-ipts.patch";
} }
{ {
name = "ms-surface/0005-surface-sam"; name = "ms-surface/0005-ithc";
patch = patchDir + "/0005-surface-sam.patch"; patch = patchDir + "/0005-ithc.patch";
} }
{ {
name = "ms-surface/0006-surface-sam-over-hid"; name = "ms-surface/0006-surface-sam";
patch = patchDir + "/0006-surface-sam-over-hid.patch"; patch = patchDir + "/0006-surface-sam.patch";
} }
{ {
name = "ms-surface/0007-surface-button"; name = "ms-surface/0007-surface-sam-over-hid";
patch = patchDir + "/0007-surface-button.patch"; patch = patchDir + "/0007-surface-sam-over-hid.patch";
} }
{ {
name = "ms-surface/0008-surface-typecover"; name = "ms-surface/0008-surface-button";
patch = patchDir + "/0008-surface-typecover.patch"; patch = patchDir + "/0008-surface-button.patch";
} }
{ {
name = "ms-surface/0009-cameras"; name = "ms-surface/0009-surface-typecover";
patch = patchDir + "/0009-cameras.patch"; patch = patchDir + "/0009-surface-typecover.patch";
} }
{ {
name = "ms-surface/0010-amd-gpio"; name = "ms-surface/0010-surface-shutdown";
patch = patchDir + "/0010-amd-gpio.patch"; patch = patchDir + "/0010-surface-shutdown.patch";
} }
{ {
name = "ms-surface/0011-rtc"; name = "ms-surface/0011-surface-gpe";
patch = patchDir + "/0011-rtc.patch"; patch = patchDir + "/0011-surface-gpe.patch";
}
{
name = "ms-surface/0012-cameras";
patch = patchDir + "/0012-cameras.patch";
}
{
name = "ms-surface/0013-amd-gpio";
patch = patchDir + "/0013-amd-gpio.patch";
}
{
name = "ms-surface/0014-rtc";
patch = patchDir + "/0014-rtc.patch";
}
{
name = "ms-surface/0015-intel-thread-director";
patch = patchDir + "/0015-intel-thread-director.patch";
} }
] ]

4
microsoft/surface/common/repos.nix
View file

@ -4,8 +4,8 @@
linux-surface = fetchFromGitHub { linux-surface = fetchFromGitHub {
owner = "linux-surface"; owner = "linux-surface";
repo = "linux-surface"; repo = "linux-surface";
rev = "91240ac43dfdfb3e68bbc604def84685a218fab9"; rev = "efe7ddadd4aad3d1a6531334fe086931ec8640a1";
sha256 = "sha256-Jf7tthFWj67Esjx+/ZwG7BYlN7zWS26e1TbsznNxE9Q="; sha256 = "sha256-WgJHLY4vU4lsZ6M0hOng8TMVRALxQeSwQM4QX6DzrbI=";
}; };
# This is the owner and repo for the pre-patched kernel from the "linux-surface" project: # This is the owner and repo for the pre-patched kernel from the "linux-surface" project:

2
microsoft/surface/surface-go/default.nix
View file

@ -17,7 +17,7 @@ in {
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
]; ];
microsoft-surface.kernelVersion = "6.1.6"; microsoft-surface.kernelVersion = "6.1.18";
boot.kernelParams = [ boot.kernelParams = [
"i915.enable_rc6=1" "i915.enable_rc6=1"

1
raspberry-pi/4/default.nix
View file

@ -11,6 +11,7 @@
./poe-hat.nix ./poe-hat.nix
./poe-plus-hat.nix ./poe-plus-hat.nix
./tc358743.nix ./tc358743.nix
./touch-ft5406.nix
./pwm0.nix ./pwm0.nix
./pkgs-overlays.nix ./pkgs-overlays.nix
]; ];