Merge branch 'master' into microsoft/surface/kernel-6.6
This commit is contained in:
mexisme
commit
921c09c127
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
|
@ -9,7 +9,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: cachix/install-nix-action@v24
|
||||
- uses: cachix/install-nix-action@v25
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
- name: Show nixpkgs version
|
||||
|
|
|
|||
|
|
@ -17,10 +17,4 @@ to your <code>configuration.nix</code> if you cannot wake from "Sleep". See refe
|
|||
== Firmware upgrades ==
|
||||
|
||||
Note that this device is supported by [https://fwupd.org/ fwupd].
|
||||
To perform firmware upgrades just activate the service
|
||||
|
||||
<code>
|
||||
services.fwupd.enable = true;
|
||||
</code>
|
||||
|
||||
Then use <code>fwupdmgr</code> to perform updates.
|
||||
To perform updates, simply use <code>fwupdmgr</code>.
|
||||
|
|
|
|||
|
|
@ -13,5 +13,9 @@
|
|||
# - https://github.com/NixOS/nixos-hardware/issues/173
|
||||
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.6") pkgs.linuxPackages_latest;
|
||||
|
||||
services.thermald.enable = true;
|
||||
# Cooling management
|
||||
services.thermald.enable = lib.mkDefault true;
|
||||
|
||||
# Allows for updating firmware via `fwupdmgr`.
|
||||
services.fwupd.enable = lib.mkDefault true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,27 @@
|
|||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/pc/laptop
|
||||
./xps-common.nix
|
||||
|
||||
# FIXME: remove this when bumblebee works again
|
||||
../../../common/gpu/nvidia/disable.nix
|
||||
];
|
||||
|
||||
|
||||
/* Bumblebee seems to fail to evaluate:
|
||||
(stack trace truncated; use '--show-trace' to show the full trace)
|
||||
|
||||
error: assertion '(useSettings -> (! libsOnly))' failed
|
||||
|
||||
at /home/joerg/git/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix:61:1:
|
||||
|
||||
60|
|
||||
61| assert useSettings -> !libsOnly;
|
||||
| ^
|
||||
62| assert !libsOnly -> kernel != null;
|
||||
|
||||
# This configuration makes intel default and optionaly applications could run nvidia with optirun.
|
||||
# To Optimize for your use case import intel or nvidia only configuration instead
|
||||
# xps-9560/intel
|
||||
|
|
@ -15,11 +29,11 @@
|
|||
# xps-9560/nvidia
|
||||
|
||||
|
||||
##### bumblebee working, needs reboot to take affect and to use it run: optirun "<application>"
|
||||
services.xserver.videoDrivers = [ "intel" "nvidia" ];
|
||||
boot.blacklistedKernelModules = [ "nouveau" "bbswitch" ];
|
||||
boot.extraModulePackages = [ pkgs.linuxPackages.nvidia_x11 ];
|
||||
hardware.bumblebee.enable = lib.mkDefault true;
|
||||
hardware.bumblebee.pmMethod = lib.mkDefault "none";
|
||||
|
||||
##### bumblebee working, needs reboot to take affect and to use it run: optirun "<application>"
|
||||
services.xserver.videoDrivers = [ "intel" "nvidia" ];
|
||||
boot.blacklistedKernelModules = [ "nouveau" "bbswitch" ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
||||
hardware.bumblebee.enable = lib.mkDefault true;
|
||||
hardware.bumblebee.pmMethod = lib.mkDefault "none";
|
||||
*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Then run
|
|||
|
||||
## Suspend/wake workaround
|
||||
|
||||
As of firmware v03.03, a bug in the EC causes the system to wake if AC is connected _despite_ the lid being closed. The following works around this, with the trade-off that keyboard presses also no longer wake the system.
|
||||
As of firmware v03.03, a bug in the EC causes the system to wake if AC is connected _despite_ the lid being closed. A workaround has been [upstreamed](https://github.com/torvalds/linux/commit/a55bdad5dfd1efd4ed9ffe518897a21ca8e4e193) in Linux v6.7. For older kernels, the following works around this, with the trade-off that keyboard presses also no longer wake the system.
|
||||
|
||||
```nix
|
||||
{
|
||||
|
|
@ -27,3 +27,43 @@ As of firmware v03.03, a bug in the EC causes the system to wake if AC is connec
|
|||
```
|
||||
|
||||
See [Framework AMD Ryzen 7040 Series lid wakeup behavior feedback](https://community.frame.work/t/tracking-framework-amd-ryzen-7040-series-lid-wakeup-behavior-feedback/39128/45).
|
||||
|
||||
## Getting the fingerprint sensor to work
|
||||
|
||||
The firmware on the fingerprint sensor needs a downgrade to make it work on Linux.
|
||||
The process is documented [here](https://knowledgebase.frame.work/en_us/updating-fingerprint-reader-firmware-on-linux-for-13th-gen-and-amd-ryzen-7040-series-laptops-HJrvxv_za).
|
||||
|
||||
However on recent NixOS versions also fwupd can no longer update the firmware.
|
||||
Using the following snippet allows to temporarly downgrade fwupd to an old-enough version:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.fwupd.enable = true;
|
||||
# we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware
|
||||
services.fwupd.package = (import (builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
|
||||
sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
|
||||
}) {
|
||||
inherit (pkgs) system;
|
||||
}).fwupd;
|
||||
}
|
||||
```
|
||||
|
||||
Afterwards the downgraded driver can be downloaded and installed like this:
|
||||
|
||||
```
|
||||
wget https://github.com/FrameworkComputer/linux-docs/raw/main/goodix-moc-609c-v01000330.cab
|
||||
sudo fwupdtool install --allow-reinstall --allow-older goodix-moc-609c-v01000330.cab
|
||||
Loading… [ - ]/nix/store/1n2l5law9g3b77hcfyp50vrhhssbrj5g-glibc-2.37-8/lib/libc.so.6: version `GLIBC_2.38' not found (required by /nix/store/f55npw04a2s6xmrbx4jw12xq16b3avb8-gvfs-1.52.1/lib/gio/modules/libgvfsdbus.so)
|
||||
Failed to load module: /nix/store/f55npw04a2s6xmrbx4jw12xq16b3avb8-gvfs-1.52.1/lib/gio/modules/libgvfsdbus.so
|
||||
Loading… [ ]12:16:46.348 FuHistory schema version 9 is unknown
|
||||
Writing… [************************************* ]12:16:57.055 FuEngine failed to update-cleanup after failed update: failed to get device before update cleanup: failed to wait for detach replug: device d432baa2162a32c1554ef24bd8281953b9d07c11 did not come back
|
||||
|
||||
failed to write: failed to reply: transfer timed out
|
||||
```
|
||||
|
||||
The error message above is harmless. After a reboot, I was able to enroll my fingerprint like this:
|
||||
|
||||
```
|
||||
sudo fprintd-enroll $USER
|
||||
```
|
||||
|
|
|
|||
|
|
@ -29,7 +29,9 @@ in
|
|||
# https://wireless.wiki.kernel.org/en/users/drivers/mediatek
|
||||
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.1") (lib.mkDefault pkgs.linuxPackages_latest);
|
||||
|
||||
services.udev.extraRules = lib.optionalString cfg.preventWakeOnAC ''
|
||||
# Workaround applied upstream in Linux >=6.7 (on BIOS 03.03)
|
||||
# https://github.com/torvalds/linux/commit/a55bdad5dfd1efd4ed9ffe518897a21ca8e4e193
|
||||
services.udev.extraRules = lib.mkIf (lib.versionOlder pkgs.linux.version "6.7" && cfg.preventWakeOnAC) ''
|
||||
# Prevent wake when plugging in AC during suspend. Trade-off: keyboard wake disabled. See:
|
||||
# https://community.frame.work/t/tracking-framework-amd-ryzen-7040-series-lid-wakeup-behavior-feedback/39128/45
|
||||
ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, ... }: {
|
||||
{ lib, pkgs, ... }: {
|
||||
imports = [
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
|
|
@ -6,9 +6,7 @@
|
|||
|
||||
# Fix TRRS headphones missing a mic
|
||||
# https://community.frame.work/t/headset-microphone-on-linux/12387/3
|
||||
#
|
||||
# This is temporary until a kernel patch is submitted
|
||||
boot.extraModprobeConfig = ''
|
||||
boot.extraModprobeConfig = lib.mkIf (lib.versionOlder pkgs.linux.version "6.6.8") ''
|
||||
options snd-hda-intel model=dell-headset-multi
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,64 +1,60 @@
|
|||
{ pkgs, ... } @ args:
|
||||
{ lib, buildLinux, fetchFromGitHub
|
||||
, kernelPatches ? []
|
||||
, structuredExtraConfig ? {}
|
||||
, extraMeta ? {}
|
||||
, argsOverride ? {}
|
||||
, ... } @ args:
|
||||
|
||||
with pkgs;
|
||||
|
||||
buildLinux (args // rec {
|
||||
let
|
||||
version = "6.1.43-linux4microchip+fpga-2023.09";
|
||||
in buildLinux (args // {
|
||||
inherit version kernelPatches extraMeta;
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = version;
|
||||
|
||||
defconfig = "mpfs_defconfig";
|
||||
|
||||
kernelPatches = [
|
||||
];
|
||||
|
||||
autoModules = false;
|
||||
|
||||
extraConfig = ''
|
||||
OF_OVERLAY y
|
||||
OF_CONFIGFS y
|
||||
MFD_SENSEHAT_CORE m
|
||||
INPUT_JOYDEV m
|
||||
INPUT_JOYSTICK y
|
||||
JOYSTICK_SENSEHAT m
|
||||
AUXDISPLAY y
|
||||
SENSEHAT_DISPLAY m
|
||||
HTS221 m
|
||||
IIO_ST_PRESS m
|
||||
IIO_ST_LSM6DSX m
|
||||
IIO_ST_MAGN_3AXIS m
|
||||
POLARFIRE_SOC_DMA_NONCOHERENT y
|
||||
MTD_SPI_NOR_USE_4K_SECTORS n
|
||||
MTD_UBI y
|
||||
MTD_CMDLINE_PARTS y
|
||||
UBIFS_FS y
|
||||
USB_UAS m
|
||||
CRYPTO_TLS m
|
||||
TLS y
|
||||
MD y
|
||||
BLK_DEV_MD m
|
||||
MD_AUTODETECT y
|
||||
MD_RAID0 m
|
||||
MD_RAID1 m
|
||||
MD_RAID10 m
|
||||
MD_RAID456 m
|
||||
DM_VERITY m
|
||||
LOGO y
|
||||
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER n
|
||||
FB_EFI n
|
||||
EFI_STUB y
|
||||
EFI y
|
||||
VIRTIO y
|
||||
VIRTIO_PCI y
|
||||
VIRTIO_BLK y
|
||||
DRM_VIRTIO_GPU y
|
||||
EXT4_FS y
|
||||
USBIP_CORE m
|
||||
USBIP_VHCI_HCD m
|
||||
USBIP_HOST m
|
||||
USBIP_VUDC m
|
||||
'';
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
OF_OVERLAY = yes;
|
||||
OF_CONFIGFS = yes;
|
||||
MFD_SENSEHAT_CORE = module;
|
||||
INPUT_JOYDEV = module;
|
||||
INPUT_JOYSTICK = yes;
|
||||
JOYSTICK_SENSEHAT = module;
|
||||
AUXDISPLAY = yes;
|
||||
SENSEHAT_DISPLAY = module;
|
||||
HTS221 = module;
|
||||
IIO_ST_PRESS = module;
|
||||
IIO_ST_LSM6DSX = module;
|
||||
IIO_ST_MAGN_3AXIS = module;
|
||||
POLARFIRE_SOC_DMA_NONCOHERENT = yes;
|
||||
MTD_SPI_NOR_USE_4K_SECTORS = no;
|
||||
MTD_UBI = yes;
|
||||
MTD_CMDLINE_PARTS = yes;
|
||||
UBIFS_FS = yes;
|
||||
USB_UAS = module;
|
||||
EFI_STUB = yes;
|
||||
EFI = yes;
|
||||
USBIP_CORE = module;
|
||||
USBIP_VHCI_HCD = module;
|
||||
USBIP_HOST = module;
|
||||
USBIP_VUDC = module;
|
||||
CRYPTO_TLS = module;
|
||||
MD = yes;
|
||||
BLK_DEV_MD = module;
|
||||
MD_LINEAR = module;
|
||||
MD_RAID0 = module;
|
||||
MD_RAID1 = module;
|
||||
MD_RAID10 = module;
|
||||
MD_RAID456 = module;
|
||||
|
||||
# This device doesn't have any kind of display output at all
|
||||
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = lib.mkForce no;
|
||||
FB_EFI = lib.mkForce no;
|
||||
} // structuredExtraConfig;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux4microchip";
|
||||
|
|
@ -66,4 +62,4 @@ buildLinux (args // rec {
|
|||
rev = "25e35c7c54ad853d03c14a02b189b408cb5b5eb3";
|
||||
sha256 = "sha256-wj7lz247MkhxmhSHUcNeWmcZK+DL+5PAnLwTmALD97M=";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
} // argsOverride)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
{ pkgs, lib, config, ... }: {
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackagesFor (pkgs.callPackage ./bsp/linux-icicle-kit.nix { });
|
||||
initrd.includeDefaultModules = lib.mkForce false;
|
||||
kernelPackages = pkgs.linuxPackagesFor (pkgs.callPackage ./bsp/linux-icicle-kit.nix {
|
||||
inherit (config.boot) kernelPatches;
|
||||
});
|
||||
initrd.includeDefaultModules = lib.mkDefault false;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ in {
|
|||
./surface-control
|
||||
];
|
||||
|
||||
microsoft-surface.kernelVersion = mkDefault "6.6.8";
|
||||
microsoft-surface.kernelVersion = mkDefault "6.6";
|
||||
|
||||
# Seems to be required to properly enable S0ix "Modern Standby":
|
||||
boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ let
|
|||
|
||||
in {
|
||||
imports = [
|
||||
./linux-6.1.x
|
||||
./linux-6.6.x
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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.1.62";
|
||||
extraMeta.branch = "6.1";
|
||||
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-uf1hb6zWvs/O74i5vnGNDxZiXKs/6B0ROEgCpwkehew=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
in {
|
||||
options.microsoft-surface.kernelVersion = mkOption {
|
||||
type = types.enum [ version majorVersion ];
|
||||
};
|
||||
|
||||
config = mkIf (cfg.kernelVersion == version || cfg.kernelVersion == majorVersion) {
|
||||
boot = {
|
||||
inherit kernelPackages;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,142 +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;
|
||||
|
||||
#
|
||||
# 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";
|
||||
}
|
||||
]
|
||||
|
|
@ -7,19 +7,19 @@ let
|
|||
|
||||
cfg = config.microsoft-surface;
|
||||
|
||||
version = "6.6.8";
|
||||
version = "6.6.10";
|
||||
kernelPatches = surfacePatches {
|
||||
inherit version;
|
||||
patchFn = ./patches.nix;
|
||||
};
|
||||
kernelPackages = linuxPackage2 {
|
||||
inherit version kernelPatches;
|
||||
sha256 = "sha256-UDbENOEeSzbY2j9ImFH3+CnPeF+n94h0aFN6nqRXJBY=";
|
||||
sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw=";
|
||||
};
|
||||
|
||||
in {
|
||||
options.microsoft-surface.kernelVersion = mkOption {
|
||||
type = types.enum [ version ];
|
||||
type = types.enum [ version majorVersion ];
|
||||
};
|
||||
|
||||
config = mkIf (cfg.kernelVersion == version) {
|
||||
|
|
|
|||
|
|
@ -12,28 +12,28 @@
|
|||
##
|
||||
## 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;
|
||||
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;
|
||||
|
||||
CONFIG_SURFACE_ACPI_NOTIFY = module;
|
||||
CONFIG_SURFACE_DTX = module;
|
||||
CONFIG_SURFACE_PLATFORM_PROFILE = module;
|
||||
SURFACE_ACPI_NOTIFY = module;
|
||||
SURFACE_DTX = module;
|
||||
SURFACE_PLATFORM_PROFILE = module;
|
||||
|
||||
CONFIG_SURFACE_HID = module;
|
||||
CONFIG_SURFACE_KBD = module;
|
||||
SURFACE_HID = module;
|
||||
SURFACE_KBD = module;
|
||||
|
||||
CONFIG_BATTERY_SURFACE = module;
|
||||
CONFIG_CHARGER_SURFACE = module;
|
||||
BATTERY_SURFACE = module;
|
||||
CHARGER_SURFACE = module;
|
||||
|
||||
##
|
||||
## Surface Hotplug
|
||||
##
|
||||
CONFIG_SURFACE_HOTPLUG = module;
|
||||
SURFACE_HOTPLUG = module;
|
||||
|
||||
##
|
||||
## IPTS and ITHC touchscreen
|
||||
|
|
@ -41,46 +41,46 @@
|
|||
## 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;
|
||||
HID_IPTS = module;
|
||||
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;
|
||||
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
|
||||
##
|
||||
CONFIG_VIDEO_OV5693 = module;
|
||||
CONFIG_VIDEO_OV7251 = module;
|
||||
CONFIG_VIDEO_OV8865 = module;
|
||||
VIDEO_OV5693 = module;
|
||||
VIDEO_OV7251 = module;
|
||||
VIDEO_OV8865 = module;
|
||||
|
||||
##
|
||||
## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
|
||||
##
|
||||
# CONFIG_INTEL_ATOMISP is not set
|
||||
# INTEL_ATOMISP is not set
|
||||
|
||||
##
|
||||
## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
|
||||
##
|
||||
CONFIG_APDS9960 = module;
|
||||
APDS9960 = 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;
|
||||
INPUT_SOC_BUTTON_ARRAY = module;
|
||||
SURFACE_3_POWER_OPREGION = module;
|
||||
SURFACE_PRO3_BUTTON = module;
|
||||
SURFACE_GPE = module;
|
||||
SURFACE_BOOK1_DGPU_SWITCH = module;
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ in {
|
|||
../../../common/cpu/intel/kaby-lake
|
||||
];
|
||||
|
||||
microsoft-surface.kernelVersion = "6.6.2";
|
||||
microsoft-surface.kernelVersion = "6.6.10";
|
||||
|
||||
boot.kernelParams = [
|
||||
"i915.enable_rc6=1"
|
||||
|
|
|
|||
Loading…
Reference in a new issue