Merge #707

707: star64: linux: 5.15.115 -> 5.15.128 r=fgaz a=fgaz



Co-authored-by: Francesco Gazzetta <fgaz@fgaz.me>

pine64/star64/linux-5.15.nix

@@ -1,7 +1,7 @@
 { lib, callPackage, linuxPackagesFor, kernelPatches, fetchpatch, ... }:
 
 let
-  modDirVersion = "5.15.115";
+  modDirVersion = "5.15.128";
   linuxPkg = { lib, fetchFromGitHub, buildLinux, ... }@args:
     buildLinux (args // {
       version = "${modDirVersion}-fishwaldo-star64";
@@ -9,8 +9,8 @@ let
       src = fetchFromGitHub {
         owner = "Fishwaldo";
         repo = "Star64_linux";
-        rev = "765947eacb2408a3a232cbe8093bf28a991f3c35"; # Star64_devel branch
+        rev = "e9ae40dd4b7eb2d5083e318ce65f81e8f01d8118"; # Star64_devel branch
-        hash = "sha256-2Gbk2BsC9LCcXfXfgzJiPdEap90Y0Fl6Fz9TvIIbmB8=";
+        hash = "sha256-jzF5NO/JAQxnaiQ79m6nws95jl17NBctWEa1MP4rimo=";
       };
 
       inherit modDirVersion;
@@ -27,7 +27,6 @@ let
              hash = "sha256-EY0lno+HkY5mradBUPII3qqu0xh+BVQRzveCQcaht0M=";
            };
          }
-         { patch = ./pl330-name-collision.patch; }
          { patch = ./irq-desc-to-data.patch; }
       ] ++ kernelPatches;
 

pine64/star64/pl330-name-collision.patch

@@ -1,40 +0,0 @@
-diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
-index 110de8a60058..0a01256ef9e4 100644
---- a/drivers/dma/pl330.c
-+++ b/drivers/dma/pl330.c
-@@ -1050,7 +1050,7 @@ static bool _trigger(struct pl330_thread *thrd)
- 	return true;
- }
- 
--static bool _start(struct pl330_thread *thrd)
-+static bool _dma_start(struct pl330_thread *thrd)
- {
- 	switch (_state(thrd)) {
- 	case PL330_STATE_FAULT_COMPLETING:
-@@ -1702,7 +1702,7 @@ static int pl330_update(struct pl330_dmac *pl330)
- 			thrd->req_running = -1;
- 
- 			/* Get going again ASAP */
--			_start(thrd);
-+			_dma_start(thrd);
- 
- 			/* For now, just make a list of callbacks to be done */
- 			list_add_tail(&descdone->rqd, &pl330->req_done);
-@@ -2089,7 +2089,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
- 	} else {
- 		/* Make sure the PL330 Channel thread is active */
- 		spin_lock(&pch->thread->dmac->lock);
--		_start(pch->thread);
-+		_dma_start(pch->thread);
- 		spin_unlock(&pch->thread->dmac->lock);
- 	}
- 
-@@ -2107,7 +2107,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
- 			if (power_down) {
- 				pch->active = true;
- 				spin_lock(&pch->thread->dmac->lock);
--				_start(pch->thread);
-+				_dma_start(pch->thread);
- 				spin_unlock(&pch->thread->dmac->lock);
- 				power_down = false;
- 			}