eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-26 21:09:42 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1212 from 8bitbuddhist/ms-surface/update-kernel-6.11.4

Browse source 
microsoft/surface: Update to kernel 6.11.4
This commit is contained in:
Jörg Thalheim 2024-11-05 18:45:50 +01:00 committed by GitHub
commit 2e78b1af80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 163 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -5,7 +5,7 @@ let
in { in {
imports = [ imports = [
./linux-6.10.x ./linux-surface
]; ];
options.microsoft-surface.kernelVersion = mkOption { options.microsoft-surface.kernelVersion = mkOption {

148
microsoft/surface/common/kernel/linux-6.10.x/patches.nix
View file

@ -1,148 +0,0 @@
{ lib,
kernel ? lib.kernel,
patchSrc,
version,
}:
[
{
name = "microsoft-surface-patches-linux-${version}";
patch = null;
extraStructuredConfig = with kernel; {
STAGING_MEDIA = yes;
#
# Surface Aggregator Module
#
SURFACE_AGGREGATOR = module;
# SURFACE_AGGREGATOR_ERROR_INJECTION is not set
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;
##
## IPTS and ITHC touchscreen
##
## This only enables the user interface for IPTS/ITHC data.
## For the touchscreen to work, you need to install iptsd.
##
HID_IPTS = module;
HID_ITHC = module;
##
## Cameras: IPU3
##
VIDEO_DW9719 = module;
VIDEO_IPU3_IMGU = module;
VIDEO_IPU3_CIO2 = module;
IPU_BRIDGE = module;
INTEL_SKL_INT3472 = module;
REGULATOR_TPS68470 = module;
COMMON_CLK_TPS68470 = module;
LEDS_TPS68470 = module;
##
## Cameras: Sensor drivers
##
VIDEO_OV5693 = module;
VIDEO_OV7251 = module;
VIDEO_OV8865 = module;
##
## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
##
# INTEL_ATOMISP is not set
##
## 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-secureboot";
patch = patchSrc + "/0001-secureboot.patch";
}
{
name = "ms-surface/0002-surface3-oemb";
patch = patchSrc + "/0002-surface3-oemb.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";
}
]

4
microsoft/surface/common/kernel/linux-6.10.x/default.nix → microsoft/surface/common/kernel/linux-surface/default.nix
View file

@ -7,14 +7,14 @@ let
cfg = config.microsoft-surface; cfg = config.microsoft-surface;
version = "6.10.5"; version = "6.11.4";
kernelPatches = surfacePatches { kernelPatches = surfacePatches {
inherit version; inherit version;
patchFn = ./patches.nix; patchFn = ./patches.nix;
}; };
kernelPackages = linuxPackage { kernelPackages = linuxPackage {
inherit version kernelPatches; inherit version kernelPatches;
sha256 = "02yckkh6sxvcrwzbqgmw4jhqhxmbvz87xn9wm6bwwka3w2r9x41h"; sha256 = "0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x";
ignoreConfigErrors=true; ignoreConfigErrors=true;
}; };

157
microsoft/surface/common/kernel/linux-surface/patches.nix Normal file
View file

@ -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-oemb";
patch = patchSrc + "/0002-surface3-oemb.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";
}
]

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 = "arch-6.10.3-1"; rev = "arch-6.11.4-1";
hash = "sha256-T7voXofI5W+YodHB2DtNSKKc4iUlN3NS0onP4TKFvQM="; hash = "sha256-5rKfAIkGoD5Y4nMobr7wGvzZqN2yFElXqHdcQS2VL14=";
}; };
# 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: