From 5d74b79586597cc171c50fd4ab5aa8edc1ffcfc7 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 11 Oct 2024 15:24:59 +0200 Subject: [PATCH 1/3] chore: pass regulator_ignore_unused as kernel arg --- module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.nix b/module.nix index c91cd9b..9b1ae0f 100644 --- a/module.nix +++ b/module.nix @@ -82,7 +82,7 @@ in "clk_ignore_unused" "pd_ignore_unused" "arm64.nopauth" - # "regulator_ignore_unused" # allows for > 30 sec to load msm, at the potential cost of power + "regulator_ignore_unused" # allows for > 30 sec to load msm, at the potential cost of power ]; initrd = { From bd580ee9c35fcb8a720122d5bb2f903f1b7395ee Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 11 Oct 2024 15:25:24 +0200 Subject: [PATCH 2/3] chore(kernelModules): s/-/_/ --- module.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module.nix b/module.nix index 9b1ae0f..5fee192 100644 --- a/module.nix +++ b/module.nix @@ -88,24 +88,24 @@ in initrd = { kernelModules = [ "nvme" - "phy-qcom-qmp-pcie" - "pcie-qcom" + "phy_qcom_qmp_pcie" + "pcie_qcom" - "i2c-core" - "i2c-hid" - "i2c-hid-of" - "i2c-qcom-geni" + "i2c_core" + "i2c_hid" + "i2c_hid-of" + "i2c_qcom-geni" "leds_qcom_lpg" "pwm_bl" "qrtr" "pmic_glink_altmode" "gpio_sbu_mux" - "phy-qcom-qmp-combo" + "phy_qcom_qmp_combo" "gpucc_sc8280xp" "dispcc_sc8280xp" "phy_qcom_edp" - "panel-edp" + "panel_edp" "msm" ]; }; From 6b9efe77ca80653354981c720af3c4241ac71490 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 11 Oct 2024 16:38:31 +0200 Subject: [PATCH 3/3] Revert "feat(linux_jhovold): bump to 6.12.0-rc2" This reverts commit d354461ec22e3a091c159a1826cf20ab4fff5f79. --- flake.lock | 8 ++++---- flake.nix | 2 +- packages/default.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 422ac12..00413f1 100644 --- a/flake.lock +++ b/flake.lock @@ -21,16 +21,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1728631036, - "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=", + "lastModified": 1726563586, + "narHash": "sha256-hZ8yue7OsrXuwoXz09/dmIiKJIQEPixK39l5S/xvJfA=", "owner": "jhovold", "repo": "linux", - "rev": "6a97bc22fa36010400b91e6d5979741c391112c3", + "rev": "c8032fa3062e04cbb68f070959fc746b91abb16e", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.12-rc2", + "ref": "wip/sc8280xp-6.11", "repo": "linux", "type": "github" } diff --git a/flake.nix b/flake.nix index aaa2ed3..bc90fce 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; - linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.12-rc2"; + linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.11"; linux-jhovold.flake = false; }; diff --git a/packages/default.nix b/packages/default.nix index 490a0be..932b79f 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -21,7 +21,7 @@ in { linux_jhovold = pkgs.callPackage linux_x13s_pkg { src = inputs.linux-jhovold; - version = "6.12.0-rc2"; + version = "6.11.0"; defconfig = "johan_defconfig"; };