From 8a671418c4a9b51e901a23759f3921960414ee5d Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 16 May 2023 19:42:48 +0800
Subject: [PATCH] starfive visionfive2: update kernel to 6.4.0-rc2

---
 starfive/visionfive/v2/default.nix                |  2 +-
 .../v2/{linux-6.3.nix => linux-6.4.nix}           | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)
 rename starfive/visionfive/v2/{linux-6.3.nix => linux-6.4.nix} (56%)

diff --git a/starfive/visionfive/v2/default.nix b/starfive/visionfive/v2/default.nix
index ee1ab3fa3..964b0e54c 100644
--- a/starfive/visionfive/v2/default.nix
+++ b/starfive/visionfive/v2/default.nix
@@ -4,7 +4,7 @@
     supportedFilesystems =
       lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
     consoleLogLevel = lib.mkDefault 7;
-    kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.3.nix {
+    kernelPackages = lib.mkDefault (pkgs.callPackage ./linux-6.4.nix {
       inherit (config.boot) kernelPatches;
     });
 
diff --git a/starfive/visionfive/v2/linux-6.3.nix b/starfive/visionfive/v2/linux-6.4.nix
similarity index 56%
rename from starfive/visionfive/v2/linux-6.3.nix
rename to starfive/visionfive/v2/linux-6.4.nix
index 6d7ed86e8..81e3f9615 100644
--- a/starfive/visionfive/v2/linux-6.3.nix
+++ b/starfive/visionfive/v2/linux-6.4.nix
@@ -1,7 +1,7 @@
-{ lib, callPackage, linuxPackagesFor, kernelPatches, fetchpatch, ... }:
+{ lib, callPackage, linuxPackagesFor, kernelPatches, ... }:
 
 let
-  modDirVersion = "6.3.0-rc4";
+  modDirVersion = "6.4.0-rc3";
   linuxPkg = { lib, fetchFromGitHub, buildLinux, ... }@args:
     buildLinux (args // {
       version = "${modDirVersion}-starfive-visionfive2";
@@ -9,19 +9,12 @@ let
       src = fetchFromGitHub {
         owner = "starfive-tech";
         repo = "linux";
-        rev = "a57bdb1d13f93c8fc1b3c668cc74d585bb20f3f8";
-        sha256 = "sha256-jnQnJChIGCyJt+zwGfUTsMhrwmWek/ngIM6Pae6OXuI=";
+        rev = "b8692bacc1a14128ed561ea6ad27d6e1e2114f1d";
+        sha256 = "sha256-d9i/LPAKt2rdUo8YEhitIgTvsBwBOzNjOzz9mPw8UUQ=";
       };
 
       inherit modDirVersion;
       kernelPatches = [
-        {
-          patch = fetchpatch {
-            url =
-              "https://github.com/torvalds/linux/commit/d83806c4c0cccc0d6d3c3581a11983a9c186a138.diff";
-            hash = "sha256-xUnEJkzQRIIBF/0GIpS0Cd+h6OdSiJlyva5xwxtleE0=";
-          };
-        }
       ] ++ kernelPatches;
 
       structuredExtraConfig = with lib.kernel; {