mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-12-04 16:59:43 +01:00
drop acpi_call from nixos-hardware
fixes https://github.com/NixOS/nixos-hardware/issues/1114 and tlp also no longer recommands it.
This commit is contained in:
parent
fe01780d35
commit
c6c90887f8
56 changed files with 5 additions and 68 deletions
|
@ -10,7 +10,6 @@
|
|||
../../../common/gpu/amd
|
||||
../../../common/hidpi.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
# apple smc (TODO: check spi)
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/hidpi.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
# Make the keyboard work in stage1, enable iommu
|
||||
|
|
|
@ -16,7 +16,6 @@ in {
|
|||
../../../common/cpu/amd/pstate.nix
|
||||
../../../common/gpu/amd
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
# acpi_call makes tlp work for newer thinkpads
|
||||
|
||||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
boot = lib.mkIf config.services.tlp.enable {
|
||||
kernelModules = [ "acpi_call" ];
|
||||
extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
|
||||
};
|
||||
}
|
|
@ -7,7 +7,6 @@ in {
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/ssd
|
||||
../sleep-resume/i2c-designware
|
||||
];
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
# Force S3 sleep mode. See README.wiki for details.
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
# Force S3 sleep mode. See README.wiki for details.
|
||||
|
|
|
@ -330,7 +330,7 @@
|
|||
common-pc = import ./common/pc;
|
||||
common-pc-hdd = import ./common/pc/hdd;
|
||||
common-pc-laptop = import ./common/pc/laptop;
|
||||
common-pc-laptop-acpi_call = import ./common/pc/laptop/acpi_call.nix;
|
||||
common-pc-laptop-acpi_call = throw "common-pc-laptop-acpi_call has been removed because it is obsolete: https://github.com/NixOS/nixos-hardware/issues/1114";
|
||||
common-pc-laptop-hdd = import ./common/pc/laptop/hdd;
|
||||
common-pc-laptop-ssd = import ./common/pc/ssd;
|
||||
common-pc-ssd = import ./common/pc/ssd;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/turing
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
gc
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
imports = [
|
||||
../../../../common/cpu/intel
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
../../../../common/cpu/amd/pstate.nix
|
||||
../../../../common/gpu/amd
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
../../../../common/cpu/amd/pstate.nix
|
||||
../../../../common/gpu/amd
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
../../../../common/cpu/amd/pstate.nix
|
||||
../../../../common/gpu/amd
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
../../../common/cpu/amd
|
||||
../../../common/gpu/amd
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
}
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/turing
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
../../../common/cpu/amd
|
||||
../../../common/gpu/amd
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
../../../common/gpu/amd
|
||||
../../../common/cpu/amd
|
||||
../../../common/cpu/amd/pstate.nix
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/ssd
|
||||
../../../common/pc/laptop/hdd
|
||||
#../../../common/hidpi.nix #hidpi
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
../.
|
||||
];
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
# might need nvidia module but we don't know the PCI ids:
|
||||
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
|
||||
#../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
imports = [
|
||||
../.
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/maxwell
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/maxwell
|
||||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/pascal
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
{
|
||||
imports = [
|
||||
../.
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
{
|
||||
imports = [
|
||||
../.
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
# For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
|
||||
|
|
|
@ -3,6 +3,5 @@
|
|||
../.
|
||||
../tp-smapi.nix
|
||||
../../../common/cpu/intel/sandy-bridge
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/ssd
|
||||
../.
|
||||
];
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/ssd
|
||||
../.
|
||||
];
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/amd
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
# Force use of the thinkpad_acpi driver for backlight control.
|
||||
|
|
|
@ -3,6 +3,5 @@
|
|||
../.
|
||||
../tp-smapi.nix
|
||||
../../../common/cpu/intel/sandy-bridge
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
];
|
||||
|
||||
|
|
|
@ -3,6 +3,5 @@
|
|||
../.
|
||||
../tp-smapi.nix
|
||||
../../../common/cpu/intel/sandy-bridge
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../../common/cpu/intel/kaby-lake
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{
|
||||
imports = [
|
||||
../.
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
../.
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd/default.nix
|
||||
];
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd/default.nix
|
||||
];
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
../../../common/cpu/amd/pstate.nix
|
||||
../../../common/gpu/amd
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
../../../../common/cpu/amd/pstate.nix
|
||||
../../../../common/gpu/amd
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/acpi_call.nix
|
||||
../../../../common/pc/ssd
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in a new issue