flake.lock

@@ -21,16 +21,16 @@
     "linux-jhovold": {
       "flake": false,
       "locked": {
-        "lastModified": 1726563586,
-        "narHash": "sha256-hZ8yue7OsrXuwoXz09/dmIiKJIQEPixK39l5S/xvJfA=",
+        "lastModified": 1728631036,
+        "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=",
         "owner": "jhovold",
         "repo": "linux",
-        "rev": "c8032fa3062e04cbb68f070959fc746b91abb16e",
+        "rev": "6a97bc22fa36010400b91e6d5979741c391112c3",
         "type": "github"
       },
       "original": {
         "owner": "jhovold",
-        "ref": "wip/sc8280xp-6.11",
+        "ref": "wip/sc8280xp-6.12-rc2",
         "repo": "linux",
         "type": "github"
       }

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.11";
+    linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.12-rc2";
     linux-jhovold.flake = false;
   };
 

module.nix

@@ -82,30 +82,30 @@ 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 = {
         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"
         ];
       };

packages/default.nix

@@ -21,7 +21,7 @@ in
 {
   linux_jhovold = pkgs.callPackage linux_x13s_pkg {
     src = inputs.linux-jhovold;
-    version = "6.11.0";
+    version = "6.12.0-rc2";
     defconfig = "johan_defconfig";
   };