From 413452614f52f3f5e7038f8456b6c0082a5594dc Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 25 May 2024 09:31:04 -0400
Subject: [PATCH] starfive visionfive2: use mainline kernel

---
 starfive/visionfive/v2/default.nix   |  7 +------
 starfive/visionfive/v2/linux-6.6.nix | 26 --------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 starfive/visionfive/v2/linux-6.6.nix

diff --git a/starfive/visionfive/v2/default.nix b/starfive/visionfive/v2/default.nix
index 62cfe63..afbef79 100644
--- a/starfive/visionfive/v2/default.nix
+++ b/starfive/visionfive/v2/default.nix
@@ -1,12 +1,7 @@
 { config, lib, pkgs, ... }: {
   boot = {
-    # Force no ZFS (from nixos/modules/profiles/base.nix) until updated to kernel 6.0
-    supportedFilesystems =
-      lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
     consoleLogLevel = lib.mkDefault 7;
-    kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.6.nix {
-      inherit (config.boot) kernelPatches;
-    });
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
     kernelParams =
       lib.mkDefault [ "console=tty0" "console=ttyS0,115200n8" "earlycon=sbi" ];
diff --git a/starfive/visionfive/v2/linux-6.6.nix b/starfive/visionfive/v2/linux-6.6.nix
deleted file mode 100644
index 5999dd6..0000000
--- a/starfive/visionfive/v2/linux-6.6.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, callPackage, linuxPackagesFor, kernelPatches, ... }:
-
-let
-  modDirVersion = "6.6.0";
-  linuxPkg = { lib, fetchFromGitHub, buildLinux, ... }@args:
-    buildLinux (args // {
-      version = "${modDirVersion}-starfive-visionfive2";
-
-      src = fetchFromGitHub {
-        owner = "starfive-tech";
-        repo = "linux";
-        rev = "13eb70da2a73187c8c7aece13d23d68928aa8210";
-        hash = "sha256-bwB7Pc+Z+MWXPfWYdgtRGuhqjiNHLDGNCY62e4lBGvE=";
-      };
-
-      inherit modDirVersion kernelPatches;
-
-      structuredExtraConfig = with lib.kernel; {
-        PINCTRL_STARFIVE_JH7110_SYS = yes;
-        SERIAL_8250_DW = yes;
-      };
-
-      extraMeta.branch = "JH7110_VisionFive2_upstream";
-    } // (args.argsOverride or { }));
-
-in lib.recurseIntoAttrs (linuxPackagesFor (callPackage linuxPkg { }))