From d4786b2a7cbe4060dc5b8d87ad5680a5536b0ead Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 23 Jun 2023 10:32:17 +0300 Subject: [PATCH 1/2] kernel/common-config: enable TPS68470 driver explicitly for old kernels --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0d0bddb61319..ff9f9079b15d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -106,6 +106,7 @@ let CHT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes; INTEL_SOC_PMIC_CHTDC_TI = whenAtLeast "5.10" yes; CHT_DC_TI_PMIC_OPREGION = whenAtLeast "5.10" yes; + MFD_TPS68470 = whenBetween "5.10" "5.13" yes; TPS68470_PMIC_OPREGION = whenAtLeast "5.10" yes; }; From 42e2cee85f25ee07738345666a4c65644c32abed Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 23 Jun 2023 10:32:38 +0300 Subject: [PATCH 2/2] kernel/common-config: fix DAMON version checks --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ff9f9079b15d..370e88096320 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -129,11 +129,11 @@ let memory = { DAMON = whenAtLeast "5.15" yes; DAMON_VADDR = whenAtLeast "5.15" yes; - DAMON_PADDR = whenAtLeast "5.15" yes; - DAMON_SYSFS = whenAtLeast "5.15" yes; + DAMON_PADDR = whenAtLeast "5.16" yes; + DAMON_SYSFS = whenAtLeast "5.18" yes; DAMON_DBGFS = whenAtLeast "5.15" yes; - DAMON_RECLAIM = whenAtLeast "5.15" yes; - DAMON_LRU_SORT = whenAtLeast "5.15" yes; + DAMON_RECLAIM = whenAtLeast "5.16" yes; + DAMON_LRU_SORT = whenAtLeast "6.0" yes; }; memtest = {