kernel/lts: Update to track 5_10

kernel/lts/default.nix

@@ -1,18 +1,27 @@
-{ pkgs, lib, linux_5_4, kernelPatches, ... } @ args:
+# By design this is only softly "pinning" to a particular major version.
+# By design, this will track the kernel upgrades in Nixpkgs.
+# It is unlikely patches won't apply on the LTS version.
+{ pkgs, lib, linux_5_10, kernelPatches, fetchpatch, ... } @ args:
 
-linux_5_4.override({
+let
-  # The way the linux kernel is composed, kernelPatches will end up filled-in twice...
+  nhp = patch: sha256: let rev = "ded66e50064c55a56a958558ab35bc6bae444e72"; in {
-  # Not entirely sure why.
+    name = patch;
+    patch = (fetchpatch {
+      url = "https://raw.githubusercontent.com/nadiaholmquist/pbp-packages/${rev}/linux-pbp/${patch}";
+      inherit sha256;
+    });
+  };
+in
+linux_5_10.override({
   kernelPatches = lib.lists.unique (kernelPatches ++ [
     pkgs.kernelPatches.bridge_stp_helper
     pkgs.kernelPatches.request_key_helper
-    pkgs.kernelPatches.export_kernel_fpu_functions."5.3"
+
+    # Kernel configuration
     {
-      name = "pinebookpro-5.4-lts.patch";
+      # None of these *need* to be set to `y`.
-      patch = ./pinebookpro-5.4-lts.patch;
+      # But eh, it works too
-    }
+      name = "pinebookpro-config";
-    {
-      name = "pinebookpro-config-fixes";
       patch = null;
       extraConfig = ''
         PCIE_ROCKCHIP y
@@ -23,14 +32,44 @@ linux_5_4.override({
         PHY_ROCKCHIP_INNO_HDMI y
         PHY_ROCKCHIP_DP y
         ROCKCHIP_MBOX y
-        STAGING_MEDIA y
-        VIDEO_HANTRO m
-        VIDEO_HANTRO_ROCKCHIP y
         USB_DWC2_PCI y
         ROCKCHIP_LVDS y
         ROCKCHIP_RGB y
       '';
     }
+    {
+      name = "video-hantro-config";
+      patch = null;
+      extraConfig = ''
+        STAGING_MEDIA y
+        VIDEO_HANTRO m
+        VIDEO_HANTRO_ROCKCHIP y
+      '';
+    }
+    {
+      # When efifb is used, rockchipdrm won't render the VT.
+      name = "rk3399-efifb-config";
+      patch = null;
+      extraConfig = ''
+        FB_EFI n
+      '';
+    }
+
+    # Misc. community patches
+    # None are *required* for basic function.
+    # https://github.com/nadiaholmquist/pbp-packages/tree/master/linux-pbp
+    (nhp "0007-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch"         "1d16gjgds670dzpkb8jjlymcpp1inab3mlzbpfdinrgvfy4pywhi")
+    (nhp "0011-typec-displayport-some-devices-have-pin-assignments-reversed.patch" "02dbkjkr4x407cysr9b0ps34izhq7p3gk9q7rz5abmazgcz62y4g")
+    (nhp "0012-usb-typec-tcpm-Add-generic-extcon-for-tcpm-enabled-devices.patch"   "1icfy8vmwm0f825bgndhmdiskrryzpsbnrfhgvpbxwjrvwmkvlar")
+    (nhp "0013-usb-typec-tcpm-Add-generic-extcon-to-tcpm.patch"                    "0qiyf42g9jd8inb85gkj6bacbid88wb3hbn3144ja3xfss1l04cw")
+    (nhp "0014-arm64-rockchip-add-DP-ALT-rockpro64.patch"                          "03k13jgcnz7wmks1y1fgzpjj2yvi114cbvprmnkyf8xrjns7x5q0")
+    (nhp "0015-ayufan-drm-rockchip-add-support-for-modeline-32MHz-e.patch"         "0z51whv0bjj45l5z3q4v0rqdvz62dh4qg8ccd87la9ga8y1v14cy")
+    (nhp "0021-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch"          "0a4zd7ihd9pj6djgcj4ayaw7ff0xs9wqgmcvhwchwy766js3l5rp")
+    (nhp "0022-phy-rockchip-typec-Set-extcon-capabilities.patch"                   "0pqq856g0yndxvg9ipbx1jv6j4ldvapgzvxzvpirygc7f0wdrz49")
+    (nhp "0023-usb-typec-altmodes-displayport-Add-hacky-generic-altmode.patch"     "1vldwg3zwrx2ppqgbhc91l48nfmjkmwwdsyq6mq6f3l1cwfdn62q")
+    (nhp "0024-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch"         "0zwwyhryghafga36mgnazn6gk88m2rvs8ng5ykk4hhg9pi5bgzh9")
+    (nhp "0026-arm64-dts-rockchip-add-typec-extcon-hack.patch"                     "1kri47nkm6qgsqgkxzgy6iwhpajcx9xwd4rf8dldr6prb9f6iv3p")
+    (nhp "pbp-2d-fix.patch"                                                        "1hwd6clk1qnjyd4jl7kjn9pnilijz4brh1p5dnv8jzr2ajx2346j")
   ]);
 })
 //